Changeset 4195

Timestamp:

03/12/08 18:09:35 (5 years ago)

Author:

thomas

Message:

opkg/libbb: Patch from Esben Haabendal <esbenhaabendal gmail com>
Fix the usage of dirname() in libbb/make_directory.c, as it is not correct according to the standard specification for dirname.

File:

• trunk/src/target/opkg/libbb/make_directory.c (modified) (2 diffs)

trunk/src/target/opkg/libbb/make_directory.c

@@ -51 +51 @@
                 if (stat (path, &st) < 0 && errno == ENOENT) {
                         int status;
-                        char *buf, *parent;
+                        char *pathcopy, *parent, *parentcopy;
                         mode_t mask;
 
@@ -57 +57 @@
                         umask (mask);
 
-                        buf = xstrdup (path);
-                        parent = dirname (buf);
-                        status = make_directory (parent, (0777 & ~mask) | 0300,
-                                        FILEUTILS_RECUR);
-                        free (buf);
+                        /* dirname is unsafe, it may both modify the
+                           memory of the path argument and may return
+                           a pointer to static memory, which can then
+                           be modified by consequtive calls to dirname */
+                        
+                        pathcopy = xstrdup (path);
+                        parent = dirname (pathcopy);
+                        parentcopy = xstrdup (parent);
+                        status = make_directory (parentcopy, (0777 & ~mask)
+                                                                         | 0300, FILEUTILS_RECUR);
+                        free (pathcopy);
+                        free (parentcopy);
+
 
                         if (status < 0 || make_directory (path, mode, 0) < 0)