fix archiver (ar) crash on FreeBSD (looks like a bug in cctools itself)

tpoechtrager · Dec 14, 2013 · 3a59671 · 3a59671
1 parent d6e269b
commit 3a59671
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/cctools/libstuff/execute.c b/cctools/libstuff/execute.c
@@ -161,11 +161,19 @@ char *str)
 	    p = allocate(bufsize);
 	    _NSGetExecutablePath(p, &bufsize);
 	}
-	prefix = realpath(p, resolved_name);
-	p = rindex(prefix, '/');
-	if(p != NULL)
-	    p[1] = '\0';
-
+	if (*p){
+		prefix = realpath(p, resolved_name);
+		if (prefix){
+			p = rindex(prefix, '/');
+			if(p != NULL)
+				p[1] = '\0';
+		} else{
+			goto invalid;
+		}
+	} else{
+		invalid:;
+		prefix = "";
+	}
     //NOTE, here we add a target alias to command str;
 	return(makestr(prefix, PROGRAM_PREFIX, str, NULL));
 }