svn commit: trunk/uClibc/libc/misc/internals

vapier at uclibc.org vapier at uclibc.org
Fri Jun 27 19:12:51 UTC 2008


Author: vapier
Date: 2008-06-27 12:12:50 -0700 (Fri, 27 Jun 2008)
New Revision: 22537

Log:
if argv[0] is NULL, dont try to parse it and subsequently crash ... found by running execve05 ltp test on blackfin ([#4194])

Modified:
   trunk/uClibc/libc/misc/internals/__uClibc_main.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c	2008-06-27 15:52:07 UTC (rev 22536)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2008-06-27 19:12:50 UTC (rev 22537)
@@ -336,12 +336,14 @@
 
     __uclibc_progname = *argv;
 #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-    program_invocation_name = *argv;
-    program_invocation_short_name = strrchr(*argv, '/');
-    if (program_invocation_short_name != NULL)
-	++program_invocation_short_name;
-    else
-	program_invocation_short_name = program_invocation_name;
+    if (*argv != NULL) {
+	program_invocation_name = *argv;
+	program_invocation_short_name = strrchr(*argv, '/');
+	if (program_invocation_short_name != NULL)
+	    ++program_invocation_short_name;
+	else
+	    program_invocation_short_name = program_invocation_name;
+    }
 #endif
 
 #ifdef __UCLIBC_CTOR_DTOR__




More information about the uClibc-cvs mailing list