Changeset 40

Timestamp:

Apr 21, 2005, 3:41:48 PM (19 years ago)

Author:

arnault

Message:

Improve the security of the path lookup for path_append and path_prepend - See CL 268

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ -6 +6 @@
         * source/cmt_symbol.cxx (find_path_entry): Look for existing PATH
         entries by comparing the real path rather than the logical
-        path. Use pwd everywhere.
+        path. Use pwd everywhere (or CmtSystem::compress_path when the
+        path is not exactly found)
+        
 
 2005-04-14  Christian Arnault  <arnault@lal.in2p3.fr> 267

CMT/HEAD/source/cmt_symbol.cxx

@@ -1941 +1941 @@
 
   cmt_string here = CmtSystem::pwd ();
-
-  CmtSystem::cd (value);
-  cmt_string rvalue = CmtSystem::pwd ();
+  cmt_string rvalue = value;
+
+  if (CmtSystem::cd (value))
+    {
+      rvalue = CmtSystem::pwd ();
+    }
+  else
+    {
+      CmtSystem::compress_path (rvalue);
+    }
 
   CmtSystem::cmt_string_vector items;
@@ -1953 +1960 @@
     {
       const cmt_string& item = items[i];
-      CmtSystem::cd (item);
-      cmt_string ritem = CmtSystem::pwd ();
+      cmt_string ritem = item;
+      if (CmtSystem::cd (item))
+        {
+          ritem = CmtSystem::pwd ();
+        }
+      else
+        {
+          CmtSystem::compress_path (ritem);
+        }
+
       if (ritem == rvalue)
         {