From 2e2b74c18896b0f21492f41c8f8d5187e231bd14 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Mon, 30 Jan 2023 10:56:03 +0100 Subject: [PATCH] In the ngspice shared library the fcn ivers is called with a NULL argument. The fix safeguards against argv0 being NULL. In this case Spice_Exec_Path is set to NULL, it is safeguarded against NULL when being used. --- src/misc/ivars.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/misc/ivars.c b/src/misc/ivars.c index 51263a200..ce5446982 100644 --- a/src/misc/ivars.c +++ b/src/misc/ivars.c @@ -105,19 +105,23 @@ ivars(char *argv0) AsciiRawFile = atoi(temp); /* path of the ngspice executable */ - Spice_Exec_Path = copy(argv0); - /* find the last occurence of "ngspice" in Spice_Exec_Path */ - char* path_end = strstr(Spice_Exec_Path, "ngspice"); - if (path_end) { - char* exec_only = strstr(path_end + 7, "ngspice"); - while (exec_only) { - path_end = strstr(exec_only, "ngspice"); + if (argv0) { + Spice_Exec_Path = copy(argv0); + /* find the last occurence of "ngspice" in Spice_Exec_Path */ + char* path_end = strstr(Spice_Exec_Path, "ngspice"); + if (path_end) { + char* exec_only = strstr(path_end + 7, "ngspice"); + while (exec_only) { + path_end = strstr(exec_only, "ngspice"); + if (path_end) + exec_only = strstr(path_end + 7, "ngspice"); + } if (path_end) - exec_only = strstr(path_end + 7, "ngspice"); + *path_end = '\0'; } - if (path_end) - *path_end = '\0'; } + else + Spice_Exec_Path = NULL; } void