shithub: choc

Info  •  Files  •  Log  •  Branches

dehacked: Eliminate some more uses of strncpy().

Use M_StringCopy() instead of strncpy() in the Dehacked code.

--- a/src/deh_io.c

+++ b/src/deh_io.c

@@ -30,6 +30,7 @@

 #include <string.h>

 #include "i_system.h"

+#include "m_misc.h"

 #include "w_wad.h"

 #include "z_zone.h"

@@ -127,8 +128,7 @@

     context->input_buffer_pos = 0;

     context->filename = malloc(9);

-    strncpy(context->filename, lumpinfo[lumpnum].name, 8);

-    context->filename[8] = '\0';

+    M_StringCopy(context->filename, lumpinfo[lumpnum].name, 9);

     return context;

 }

--- a/src/deh_mapping.c

+++ b/src/deh_mapping.c

@@ -32,6 +32,8 @@

 #include "doomtype.h"

 #include "i_system.h"

+#include "m_misc.h"

+

 #include "deh_mapping.h"

 static deh_mapping_entry_t *GetMappingEntryByName(deh_context_t *context,

@@ -158,7 +160,7 @@

     // Copy value into field:

-    strncpy(location, value, entry->size);

+    M_StringCopy(location, value, entry->size);

     return true;

 }