Changeset 15525 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Nov 8, 2007, 2:50:00 PM (19 years ago)

Author:

Paul Price

Message:

Variable 'path' is on a psMetadataItem, so using "psStringAppend" on
it can invalidate the pointer (if additional memory needs to be
allocated), causing memory corruption because the pointer on the
psMetadataItem no longer points to valid memory.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (1 diff)

trunk/psModules/src/config/pmConfig.c

@@ -551 +551 @@
 
     psString path = psMetadataLookupStr(NULL, config->site, "PATH");
+    psString newPath = NULL;            // New path
+    // The following gymnastics with 'newPath' are required to avoid changing the pointer out from under the
+    // psMetadataItem on which 'path' sits (leading to memory corruption because it no longer points to valid
+    // memory).
     if (path) {
-        psStringAppend(&path, ":%s", siteNameDir);
+        psStringAppend(&newPath, "%s:%s", path, siteNameDir);
     } else {
-        path = psMemIncrRefCounter(siteNameDir);
-    }
-    pmConfigSet(path);
+        newPath = psMemIncrRefCounter(siteNameDir);
+    }
     psFree(siteNameDir);
+    pmConfigSet(newPath);
+    psFree(newPath);
 
     // Next, we do a similar thing for the camera configuration file.  The