aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2025-06-19 21:07:22 +0200
committerMark Wielaard <mark@klomp.org>2025-06-19 21:07:31 +0200
commitaf79253677ad98d6dfe11ea315ee9947d86586d3 (patch)
treebe2ddf6b5b9ee8687304d70b3723ad5dc7acc336
parent2b76d786553ef5a0325bd77cce02541cdf76827e (diff)
downloadbzip2-master.tar.gz
bzip2-master.tar.bz2
bzip2-master.zip
bzip2.c: Check argc >= 1 && argv[0] != NULLHEADmaster
This should never happen, but if there is no, or a NULL argv[0] then use a hard coded string "bzip2" when calling copyFileName to define progNameReally. https://sourceware.org/bugzilla/show_bug.cgi?id=33046
Diffstat (limited to '')
-rw-r--r--bzip2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/bzip2.c b/bzip2.c
index 9ef7536..0c4445c 100644
--- a/bzip2.c
+++ b/bzip2.c
@@ -1825,7 +1825,11 @@ IntNative main ( IntNative argc, Char *argv[] )
1825 copyFileName ( inName, (Char*)"(none)" ); 1825 copyFileName ( inName, (Char*)"(none)" );
1826 copyFileName ( outName, (Char*)"(none)" ); 1826 copyFileName ( outName, (Char*)"(none)" );
1827 1827
1828 copyFileName ( progNameReally, argv[0] ); 1828 if (argc >= 1 && argv[0] != NULL)
1829 copyFileName ( progNameReally, argv[0] );
1830 else
1831 copyFileName ( progNameReally, (Char*)"bzip2" );
1832
1829 progName = &progNameReally[0]; 1833 progName = &progNameReally[0];
1830 for (tmp = &progNameReally[0]; *tmp != '\0'; tmp++) 1834 for (tmp = &progNameReally[0]; *tmp != '\0'; tmp++)
1831 if (*tmp == PATH_SEP) progName = tmp + 1; 1835 if (*tmp == PATH_SEP) progName = tmp + 1;