mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-12-11 07:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not access invalid lastdir

Browse source
This commit is contained in:
Arun Prakash Jana 2019-11-30 03:51:29 +05:30
parent f231c35ef9
commit ef88a31a7c
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nnn.c
View file

@ -4132,6 +4132,7 @@ static void browse(char *ipath, const char *session)
char rundir[PATH_MAX] __attribute__ ((aligned)); char rundir[PATH_MAX] __attribute__ ((aligned));
char runfile[NAME_MAX + 1] __attribute__ ((aligned)); char runfile[NAME_MAX + 1] __attribute__ ((aligned));
uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT)); uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT));
uint utmp;
int r = -1, fd, presel, selstartid = 0, selendid = 0; int r = -1, fd, presel, selstartid = 0, selendid = 0;
ino_t inode = 0; ino_t inode = 0;
enum action sel; enum action sel;
@ -4172,7 +4173,7 @@ static void browse(char *ipath, const char *session)
errexit(); errexit();
begin: begin:
if (cfg.selmode && nselected) if (cfg.selmode && nselected && lastdir[0])
updateselbuf(lastdir, newpath); updateselbuf(lastdir, newpath);
#ifdef LINUX_INOTIFY #ifdef LINUX_INOTIFY
@ -4804,6 +4805,16 @@ nochange:
if (rangesel) if (rangesel)
rangesel = FALSE; rangesel = FALSE;
/* Write the path to selection file to avoid flush */
if (!(dents[cur].flags & FILE_SELECTED)) {
utmp = selbufpos;
appendfpath(newpath, mkpath(path, dents[cur].name, newpath));
writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */
spawn(copier, NULL, NULL, NULL, F_NOTRACE);
selbufpos = utmp;
}
/* Toggle selection status */
dents[cur].flags ^= FILE_SELECTED; dents[cur].flags ^= FILE_SELECTED;
dents[cur].flags ? ++nselected : --nselected; dents[cur].flags ? ++nselected : --nselected;
@ -4862,11 +4873,24 @@ nochange:
selendid = ndents - 1; selendid = ndents - 1;
} }
/* Remember current selection buffer position */
utmp = selbufpos;
for (r = selstartid; r <= selendid; ++r) for (r = selstartid; r <= selendid; ++r)
if (!(dents[r].flags & FILE_SELECTED)) { if (!(dents[r].flags & FILE_SELECTED)) {
/* Write the path to selection file to avoid flush */
appendfpath(newpath, mkpath(path, dents[r].name, newpath));
dents[r].flags |= FILE_SELECTED; dents[r].flags |= FILE_SELECTED;
++nselected; ++nselected;
} }
if (selbufpos != utmp) {
writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */
spawn(copier, NULL, NULL, NULL, F_NOTRACE);
/* Restore current selection buffer position */
selbufpos = utmp;
}
continue; continue;
case SEL_SELLIST: case SEL_SELLIST:
if (listselbuf(path, newpath) || listselfile()) { if (listselbuf(path, newpath) || listselfile()) {