Improved fsafetranslate fix

AliceLR · Feb 23, 2018 · 3982479 · 3982479
1 parent 330557f
commit 3982479
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/fsafeopen.c b/src/fsafeopen.c
@@ -335,6 +335,11 @@ int fsafetranslate(const char *path, char *newpath)
         if(stat(newpath, &file_info) != 0)
           ret = -FSAFE_MATCH_FAILED;
       }
+      else
+      {
+        // Replace the failed match with the original user-supplied path
+        fsafetest(path, newpath);
+      }
 #else
       // on WIN32 we can't, so fail hard
       ret = -FSAFE_MATCH_FAILED;
@@ -357,8 +362,6 @@ int fsafetranslate(const char *path, char *newpath)
   }
   else
   {
-    // Replace the failed translation with the user-supplied path
-    strcpy(newpath, path);
     debug("%s:%d: failed to translate %s (err %d).\n",
      __FILE__, __LINE__, path, ret);
   }