From c9c2294b97d1dd7c3c3f15aeffb4a3e68c5bda18 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Wed, 21 Aug 2024 17:29:07 +0200 Subject: [PATCH] Fix display(8) session_argv being out of scope. --- display/display.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/display/display.c b/display/display.c index 153ee8ba..9a9c4edd 100644 --- a/display/display.c +++ b/display/display.c @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) ready(); char* home_session = NULL; - char** session_argv = NULL; + char** session_argv = session_argv = (char*[]) {NULL, NULL}; if ( optind < argc ) session_argv = argv + optind; else @@ -99,7 +99,9 @@ int main(int argc, char* argv[]) else if ( !access("/etc/default/displayrc", F_OK) ) session_path = "/etc/default/displayrc"; if ( session_path ) - session_argv = (char**) (const char*[]) {session_path, NULL}; + session_argv[0] = (char*) session_path; + else + session_argv = NULL; } if ( session_argv )