Changeset 3241 for trunk/src/kmk/kmkbuiltin

Timestamp:

Dec 25, 2018, 9:59:03 PM (7 years ago)

Author:

bird

Message:

kmk_install: Fixed create_tempfile (glibc wants exactly 6 X'es) and did proper overflow handling.

File:

• trunk/src/kmk/kmkbuiltin/install.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/install.c

@@ -859 +859 @@
 create_tempfile(const char *path, char *temp, size_t tsize)
 {
-        char *p;
-
-        (void)strncpy(temp, path, tsize);
-        temp[tsize - 1] = '\0';
-        if ((p = last_slash(temp)) != NULL)
-                p++;
+        static char s_szTemplate[] = "INS@XXXXXX";
+        const char *p = last_slash(path);
+        if (p) {
+                size_t cchDir = ++p - path;
+                if (cchDir + sizeof(s_szTemplate) <= tsize) {
+                        memcpy(temp, path, cchDir);
+                        memcpy(&temp[cchDir], s_szTemplate, sizeof(s_szTemplate));
+                } else
+                        return EOVERFLOW;
+        } else if (tsize >= sizeof(s_szTemplate))
+                memcpy(temp, s_szTemplate, sizeof(s_szTemplate));
         else
-                p = temp;
-        (void)strncpy(p, "INS@XXXX", &temp[tsize - 1] - p);
-        temp[tsize - 1] = '\0';
+                return EOVERFLOW;
+
         return (mkstemp(temp));
 }