From d835f72c6c285ae79dfad9a663852a8c2c82d030 Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Sun, 8 Oct 2017 00:02:29 -0400 Subject: [PATCH] Fix segfault when SHLVL env var is not available (#52) --- nnn.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nnn.c b/nnn.c index 450474df..28335898 100644 --- a/nnn.c +++ b/nnn.c @@ -559,6 +559,7 @@ spawn(char *file, char *arg1, char *arg2, char *dir, uchar flag) { pid_t pid; int status; + char *shlvl; if (flag & F_NORMAL) exitcurses(); @@ -568,10 +569,12 @@ spawn(char *file, char *arg1, char *arg2, char *dir, uchar flag) if (dir != NULL) status = chdir(dir); + shlvl = getenv("SHLVL"); + /* Show a marker (to indicate nnn spawned shell) */ - if (flag & F_MARKER) { + if (flag & F_MARKER && shlvl != NULL) { printf("\n +-++-++-+\n | n n n |\n +-++-++-+\n\n"); - printf("Spawned shell level: %d\n", atoi(getenv("SHLVL")) + 1); + printf("Spawned shell level: %d\n", atoi(shlvl) + 1); } /* Suppress stdout and stderr */