[126475] trunk/base/src/darwintracelib1.0/proc.c

[cal at macports.org]

Revision: 126475
          https://trac.macports.org/changeset/126475
Author:   cal at macports.org
Date:     2014-10-10 16:06:53 -0700 (Fri, 10 Oct 2014)
Log Message:
-----------
base: tracelib: don't crash on posix_spawn with NULL envp, #45318

Modified Paths:
--------------
    trunk/base/src/darwintracelib1.0/proc.c

Modified: trunk/base/src/darwintracelib1.0/proc.c
===================================================================
--- trunk/base/src/darwintracelib1.0/proc.c	2014-10-10 22:44:35 UTC (rev 126474)
+++ trunk/base/src/darwintracelib1.0/proc.c	2014-10-10 23:06:53 UTC (rev 126475)
@@ -148,7 +148,7 @@
 	char **copy;
 	char **copyiter;
 
-	while (*enviter != NULL) {
+	while (enviter != NULL && *enviter != NULL) {
 		envlen++;
 		enviter++;
 	}
@@ -159,7 +159,7 @@
 	enviter  = envp;
 	copyiter = copy;
 
-	while (*enviter != NULL) {
+	while (enviter != NULL && *enviter != NULL) {
 		char *val = *enviter;
 		if (__darwintrace_strbeginswith(val, "DYLD_INSERT_LIBRARIES=")) {
 			val = dyld_insert_libraries_ptr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141010/d6c6c41d/attachment.html>