make prefix_path() never return NULL
There are 9 places where prefix_path is called, and only in one of them the returned pointer was checked to be non-zero and only to call exit(128) as it is usually done by die(). In other 8 places, the returned value was not checked and it caused SIGSEGV when a path outside of the working tree was used. For instance, running git update-index --add /some/path/outside caused SIGSEGV. This patch changes prefix_path() to die if the path is outside of the repository, so it never returns NULL. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Dmitry Potapov committed
Oct 5, 2008 at 04:40 UTC
62525ef78e8aec776f44da525030d76b52f14a57
1 file changed
+2
-7
setup.c
+2
-7
@@ -110,9 +110,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
110
if (strncmp(sanitized, work_tree, len) ||
111
(sanitized[len] != '\0' && sanitized[len] != '/')) {
112
error_out:
113
- error("'%s' is outside repository", orig);
114
- free(sanitized);
115
- return NULL;
113
+ die("'%s' is outside repository", orig);
114
}
115
if (sanitized[len] == '/')
116
len++;
@@ -216,10 +214,7 @@ const char **get_pathspec(const char *prefix, const char **pathspec)
214
prefixlen = prefix ? strlen(prefix) : 0;
215
while (*src) {
216
const char *p = prefix_path(prefix, prefixlen, *src);
219
- if (p)
220
- *(dst++) = p;
221
- else
222
- exit(128); /* error message already given */
217
+ *(dst++) = p;
218
src++;
219
}
220
*dst = NULL;