utf8: don't allow NUL in decoded strings.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 048b801d181636186a11fc99de0d003d68cff18f..33651ef4df3bc95c27ad12a25327439a40ce4213 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -411,7 +411,7 @@ static const struct test base_tests[] = {
          "int main(int argc, char *argv[]) {\n"
          "     (void)argc;\n"
          "     char pad[sizeof(int *) * 1];\n"
-         "     strncpy(pad, argv[0], sizeof(pad));\n"
+         "     memcpy(pad, argv[0], sizeof(pad));\n"
          "     int *x = (int *)pad, *y = (int *)(pad + 1);\n"
          "     return *x == *y;\n"
          "}\n" },
@@ -639,7 +639,7 @@ static struct test *find_test(const char *name)
 #define MAIN_BODY_BOILERPLATE "return 0;\n"
 #define MAIN_END_BOILERPLATE "}\n"
 
-static bool run_test(const char *cmd, const char* wrapper, struct test *test)
+static bool run_test(const char *cmd, const char *wrapper, struct test *test)
 {
        char *output, *newcmd;
        FILE *outf;
@@ -757,17 +757,10 @@ static bool run_test(const char *cmd, const char* wrapper, struct test *test)
                /* We run INSIDE_MAIN tests for sanity checking. */
                if (strstr(test->style, "EXECUTE")
                    || strstr(test->style, "INSIDE_MAIN")) {
-                       char* cmd = "." DIR_SEP OUTPUT_FILE;
-                       if(wrapper) {
-                               // string length and null terminator.
-                               size_t size = strlen(wrapper) + strlen(" ") + strlen(cmd) + 1;
-                               char* newcmd = malloc(size);
-                               memset(newcmd, '\0', size);
-                               strcat(newcmd, wrapper);
-                               strcat(newcmd, " ");
-                               strcat(newcmd, cmd);
-                               cmd = newcmd;
-                       }
+                       char *cmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
+
+                       strcpy(cmd, wrapper);
+                       strcat(cmd, " ." DIR_SEP OUTPUT_FILE);
                        output = run(cmd, &status);
                        if (wrapper) {
                                free(cmd);
@@ -922,7 +915,7 @@ int main(int argc, const char *argv[])
                = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
        const char *outflag = DEFAULT_OUTPUT_EXE_FLAG;
        const char *configurator_cc = NULL;
-       const char *wrapper = NULL;
+       const char *wrapper = "";
        const char *orig_cc;
        const char *varfile = NULL;
        const char *headerfile = NULL;