ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
David Lawrence Ramsey 2006-07-05 03:38:49 +00:00
parent 4953e49d92
commit a7bdd2e9c6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -17,6 +17,10 @@ CVS code -
- After entering "..", select the directory we were in before - After entering "..", select the directory we were in before
instead of the first filename in the list, as Pico does. (DLR) instead of the first filename in the list, as Pico does. (DLR)
- Simplify screen update handling and exiting. (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() browser_init()
- Fix off-by-one error when calculating longest that kept the - Fix off-by-one error when calculating longest that kept the
rightmost column of the screen from being used. (DLR) rightmost column of the screen from being used. (DLR)

7
src/browser.c
View File

@ -415,11 +415,8 @@ char *do_browse_from(const char *inpath)
#ifndef DISABLE_OPERATINGDIR #ifndef DISABLE_OPERATINGDIR
/* If the resulting path isn't in the operating directory, use /* If the resulting path isn't in the operating directory, use
* the operating directory instead. */ * the operating directory instead. */
if (check_operating_dir(path, FALSE)) { if (check_operating_dir(path, FALSE))
if (path != NULL) path = mallocstrcpy(path, operating_dir);
free(path);
path = mallocstrcpy(NULL, operating_dir);
}
#endif #endif
if (path != NULL) if (path != NULL)