tests: silence some CodeQL warnings in test_utils/test_main.c

Use fchmod() instead of chmod() if available
Use strncpy() and strncat() instead of strcpy() and strcat()

diff --git a/test_utils/test_main.c b/test_utils/test_main.c
index 587301cf57759b812840c38efd44f03a7cfb3599..f6d9924837624c304d767857fa4dbb7a56dbe56b 100644 (file)
--- a/test_utils/test_main.c
+++ b/test_utils/test_main.c
@@ -1970,7 +1970,12 @@ assertion_make_file(const char *file, int line,
                failure_finish(NULL);
                return (0);
        }
-       if (0 != chmod(path, mode)) {
+#ifdef HAVE_FCHMOD
+       if (0 != fchmod(fd, mode))
+#else
+       if (0 != chmod(path, mode))
+#endif
+       {
                failure_start(file, line, "Could not chmod %s", path);
                failure_finish(NULL);
                close(fd);
@@ -3859,6 +3864,10 @@ main(int argc, char **argv)
        static const int limit = sizeof(tests) / sizeof(tests[0]);
        int test_set[sizeof(tests) / sizeof(tests[0])];
        int i = 0, j = 0, tests_run = 0, tests_failed = 0, option;
+       int testprogdir_len;
+#ifdef PROGRAM 
+       int tmp2_len;
+#endif
        time_t now;
        char *refdir_alloc = NULL;
        const char *progname;
@@ -3895,12 +3904,13 @@ main(int argc, char **argv)
         * tree.
         */
        progname = p = argv[0];
-       if ((testprogdir = (char *)malloc(strlen(progname) + 1)) == NULL)
+       testprogdir_len = strlen(progname) + 1;
+       if ((testprogdir = (char *)malloc(testprogdir_len)) == NULL)
        {
                fprintf(stderr, "ERROR: Out of memory.");
                exit(1);
        }
-       strcpy(testprogdir, progname);
+       strncpy(testprogdir, progname, testprogdir_len);
        while (*p != '\0') {
                /* Support \ or / dir separators for Windows compat. */
                if (*p == '/' || *p == '\\')
@@ -4042,15 +4052,15 @@ main(int argc, char **argv)
 #ifdef PROGRAM
        if (testprogfile == NULL)
        {
-               if ((tmp2 = (char *)malloc(strlen(testprogdir) + 1 +
-                       strlen(PROGRAM) + 1)) == NULL)
+               tmp2_len = strlen(testprogdir) + 1 + strlen(PROGRAM) + 1;
+               if ((tmp2 = (char *)malloc(tmp2_len)) == NULL)
                {
                        fprintf(stderr, "ERROR: Out of memory.");
                        exit(1);
                }
-               strcpy(tmp2, testprogdir);
-               strcat(tmp2, "/");
-               strcat(tmp2, PROGRAM);
+               strncpy(tmp2, testprogdir, tmp2_len);
+               strncat(tmp2, "/", tmp2_len);
+               strncat(tmp2, PROGRAM, tmp2_len);
                testprogfile = tmp2;
        }