in do_browse_from(), during the operating directory check, if path isn't

NULL, don't bother freeing it before mallocstrcpy()ing operating_dir
into it, as the latter operation will free it

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3746 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 15ed992da612aab3774f4bff7fc42799f1fa5455..82c2db5eb986e8c92f6f12f71f6e48e4887e2131 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@ CVS code -
        - After entering "..", select the directory we were in before
          instead of the first filename in the list, as Pico does. (DLR)
        - Simplify screen update handling and exiting. (DLR)
+  do_browse_from()
+       - During the operating directory check, if path isn't NULL,
+         don't bother freeing it before mallocstrcpy()ing operating_dir
+         into it, as the latter operation will free it. (DLR)
   browser_init()
        - Fix off-by-one error when calculating longest that kept the
          rightmost column of the screen from being used. (DLR)

diff --git a/src/browser.c b/src/browser.c
index 868b87c3c9ba2cf7feb8150387f46dab5be49c47..3932a956a1987c32c45d9a0bc288cb7ce84713ae 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -415,11 +415,8 @@ char *do_browse_from(const char *inpath)
 #ifndef DISABLE_OPERATINGDIR
     /* If the resulting path isn't in the operating directory, use
      * the operating directory instead. */
-    if (check_operating_dir(path, FALSE)) {
-       if (path != NULL)
-           free(path);
-       path = mallocstrcpy(NULL, operating_dir);
-    }
+    if (check_operating_dir(path, FALSE))
+       path = mallocstrcpy(path, operating_dir);
 #endif
 
     if (path != NULL)