Changeset 15560

Timestamp:

Nov 9, 2007, 2:51:47 PM (19 years ago)

Author:

eugene

Message:

updating from head

File:

• branches/eam_branch_20071023/psModules/src/config/pmConfig.c (modified) (3 diffs)

branches/eam_branch_20071023/psModules/src/config/pmConfig.c

@@ -510 +510 @@
 
         // Set trace destinations
-        #ifndef PS_NO_TRACE
         argNum = psArgumentGet(*argc, argv, "-tracedest");
         if (argNum > 0) {
@@ -531 +530 @@
             psWarning("Unable to set log destination to file %d\n", config->traceFD);
         }
-        #endif
 
         // Allow command line options to override defaults for logging.
@@ -553 +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