Use strdup over strlen+strcpy

Author: jengelh

Descent3/Inventory.cpp

@@ -580,9 +580,7 @@ bool Inventory::AddCounterMeasure(int id, int aux_type, int aux_id, int flags, c
     newnode->iflags |= INVF_SELECTABLE | INVF_USEABLE | INVF_MISSIONITEM | INVF_TIMEOUTONSPEW;
 
     if (Weapons[id].icon_handle >= 0) {
-      newnode->icon_name =
-          mem_rmalloc<char>(strlen(GameBitmaps[GameTextures[Weapons[id].icon_handle].bm_handle].name) + 1);
-      strcpy(newnode->icon_name, GameBitmaps[GameTextures[Weapons[id].icon_handle].bm_handle].name);
+      newnode->icon_name = mem_strdup(GameBitmaps[GameTextures[Weapons[id].icon_handle].bm_handle].name);
     } else {
       newnode->icon_name = nullptr;
     }
@@ -647,8 +645,7 @@ bool Inventory::AddObjectItem(int otype, int oid, int oauxt, int oauxi, int flag
     newnode->oid = oauxi;
 
     if (Object_info[oid].description) {
-      newnode->description = mem_rmalloc<char>(strlen(Object_info[oid].description) + 1);
-      strcpy(newnode->description, Object_info[oid].description);
+      newnode->description = mem_strdup(Object_info[oid].description);
     } else {
       newnode->description = mem_rmalloc<char>();
       newnode->description[0] = 0;
@@ -672,8 +669,7 @@ bool Inventory::AddObjectItem(int otype, int oid, int oauxt, int oauxi, int flag
     if (flags & INVAF_LEVELLAST)
       newnode->iflags |= INVAF_LEVELLAST;
 
-    newnode->icon_name = mem_rmalloc<char>(strlen(Object_info[oid].icon_name) + 1);
-    strcpy(newnode->icon_name, Object_info[oid].icon_name);
+    newnode->icon_name = mem_strdup(Object_info[oid].icon_name);
 
     if (description) {
       newnode->name = mem_strdup(description);

Descent3/LoadLevel.cpp

@@ -1684,8 +1684,7 @@ int ReadObject(CFILE *ifile, object *objp, int handle, int fileversion) {
 
   // Set the name
   if (tempname[0]) {
-    objp->name = mem_rmalloc<char>(strlen(tempname) + 1);
-    strcpy(objp->name, tempname);
+    objp->name = mem_strdup(tempname);
   }
 
   // Update checksum
@@ -2444,8 +2443,7 @@ int ReadRoom(CFILE *ifile, room *rp, int version) {
     char tempname[ROOM_NAME_LEN + 1];
     cf_ReadString(tempname, sizeof(tempname), ifile);
     if (strlen(tempname)) {
-      rp->name = mem_rmalloc<char>(strlen(tempname) + 1);
-      strcpy(rp->name, tempname);
+      rp->name = mem_strdup(tempname);
     }
   }
 

Descent3/TelComEffects.cpp

@@ -1253,10 +1253,9 @@ bool CreateMovie(tceffect *tce, const char *filename) {
   tce->movieinfo.filename = NULL;
   tce->w = tce->h = 100;
 
-  tce->movieinfo.filename = mem_rmalloc<char>(strlen(filename) + 1);
+  tce->movieinfo.filename = mem_strdup(filename);
   if (!tce->movieinfo.filename)
     return false;
-  strcpy(tce->movieinfo.filename, filename);
   tce->movieinfo.handle = StartMovie(filename);
   if (!tce->movieinfo.handle)
     return false;

Descent3/levelgoal.cpp

@@ -289,8 +289,7 @@ bool lgoal::SetName(int handle, char *name) {
   if (m_name)
     mem_free(m_name);
 
-  m_name = mem_rmalloc<char>(strlen(name) + 1);
-  strcpy(m_name, name);
+  m_name = mem_strdup(name);
   m_modified = 1;
 
   if (Game_mode & GM_MULTI && Netgame.local_role != LR_CLIENT) {
@@ -321,9 +320,7 @@ bool lgoal::SetCompletionMessage(char *message) {
   if (m_completion_message)
     mem_free(m_completion_message);
 
-  m_completion_message = mem_rmalloc<char>(strlen(message) + 1);
-  strcpy(m_completion_message, message);
-
+  m_completion_message = mem_strdup(message);
   return true;
 }
 
@@ -334,9 +331,7 @@ bool lgoal::SetItemName(char *iname) {
   if (m_item_name)
     mem_free(m_item_name);
 
-  m_item_name = mem_rmalloc<char>(strlen(iname) + 1);
-  strcpy(m_item_name, iname);
-
+  m_item_name = mem_strdup(iname);
   return true;
 }
 
@@ -443,9 +438,7 @@ bool lgoal::SetDesc(char *desc) {
   if (m_desc)
     mem_free(m_desc);
 
-  m_desc = mem_rmalloc<char>(strlen(desc) + 1);
-  strcpy(m_desc, desc);
-
+  m_desc = mem_strdup(desc);
   return true;
 }
 

Descent3/localization.cpp

@@ -678,10 +678,9 @@ void GrowString::operator+=(char *str) {
     node->next = NULL;
     curr = node;
   } else {
-    root.string_data = mem_rmalloc<char>(strlen(str) + 1);
+    root.string_data = mem_strdup(str);
     if (!root.string_data)
       return;
-    strcpy(root.string_data, str);
     root.next = NULL;
   }
 }

Descent3/subtitles.cpp

@@ -186,11 +186,9 @@ void SubtParseSubtitles(CFILE *file) {
 
     Subtitles[Num_subtitles].first_frame = first_frame;
     Subtitles[Num_subtitles].last_frame = last_frame;
-    Subtitles[Num_subtitles].msg = mem_rmalloc<char>(strlen(p) + 1);
+    Subtitles[Num_subtitles].msg = mem_strdup(p); // be sure to free this later
     if (!Subtitles[Num_subtitles].msg)
       goto subt_parse_error;
-    strcpy(Subtitles[Num_subtitles].msg, p); // be sure to free this later
-
     Num_subtitles++;
 
     PARSE_NEXT_LINE();

cfile/cfile.cpp

@@ -522,10 +522,9 @@ CFILE *open_file_in_directory(const std::filesystem::path &filename, const char
   cfile = mem_rmalloc<CFILE>();
   if (!cfile)
     Error("Out of memory in open_file_in_directory()");
-  cfile->name = mem_rmalloc<char>(strlen(PATH_TO_CSTR(using_filename)) + 1);
+  cfile->name = mem_strdup(PATH_TO_CSTR(using_filename));
   if (!cfile->name)
     Error("Out of memory in open_file_in_directory()");
-  strcpy(cfile->name, PATH_TO_CSTR(using_filename));
   cfile->file = fp;
   cfile->lib_handle = -1;
   cfile->size = ddio_GetFileLength(fp);

editor/BriefEdit.cpp

@@ -739,9 +739,8 @@ void BEAddTextEffect(TCTEXTDESC *desc, char *text, char *description, int id) {
     mem_free(befx->text);
     befx->text = NULL;
   }
-  befx->text = mem_rmalloc<char>(strlen(text) + 1);
+  befx->text = mem_strdup(text);
   ASSERT(befx->text);
-  strcpy(befx->text, text);
 
   // Setup for items not set with caps
   if (!(dest->caps & TCTD_FONT)) {