From 270342463f28e294ad093047c033dac93a82fd6c Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 20 Mar 2012 19:28:22 +0000 Subject: [PATCH] More "malloc + strlen + strcpy --> strdup" in module parameter code. git-svn-id: https://svn.eduke32.com/eduke32@2506 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/astub.c | 6 ++---- polymer/eduke32/source/game.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 444aade1c..1f112d009 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -8583,8 +8583,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv) if (argc > i+1) { g_scriptModules = (char **) Brealloc (g_scriptModules, (g_scriptModulesNum+1) * sizeof(char *)); - g_scriptModules[g_scriptModulesNum] = Bmalloc(Bstrlen((char *)argv[i+1]) + 1); - Bstrcpy(g_scriptModules[g_scriptModulesNum], (char *)argv[i+1]); + g_scriptModules[g_scriptModulesNum] = Bstrdup(argv[i+1]); ++g_scriptModulesNum; i++; } @@ -8596,8 +8595,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv) if (argc > i+1) { g_defModules = (char **) Brealloc (g_defModules, (g_defModulesNum+1) * sizeof(char *)); - g_defModules[g_defModulesNum] = Bmalloc(Bstrlen((char *)argv[i+1]) + 1); - Bstrcpy(g_defModules[g_defModulesNum], (char *)argv[i+1]); + g_defModules[g_defModulesNum] = Bstrdup(argv[i+1]); ++g_defModulesNum; i++; } diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 92f21f28b..4fa3371f9 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -8826,8 +8826,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv) if (argc > i+1) { g_scriptModules = (char **) Brealloc (g_scriptModules, (g_scriptModulesNum+1) * sizeof(char *)); - g_scriptModules[g_scriptModulesNum] = Bmalloc(Bstrlen((char *)argv[i+1]) + 1); - Bstrcpy(g_scriptModules[g_scriptModulesNum], (char *)argv[i+1]); + g_scriptModules[g_scriptModulesNum] = Bstrdup(argv[i+1]); ++g_scriptModulesNum; i++; } @@ -8839,8 +8838,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv) if (argc > i+1) { g_defModules = (char **) Brealloc (g_defModules, (g_defModulesNum+1) * sizeof(char *)); - g_defModules[g_defModulesNum] = Bmalloc(Bstrlen((char *)argv[i+1]) + 1); - Bstrcpy(g_defModules[g_defModulesNum], (char *)argv[i+1]); + g_defModules[g_defModulesNum] = Bstrdup(argv[i+1]); ++g_defModulesNum; i++; }