Merge branch 'jc/xstrfmt-null-with-prec-0'

gitster · gitster · commit 3f80d16c1c0d · 2016-04-22T15:45:08.000-07:00
* jc/xstrfmt-null-with-prec-0:
  setup.c: do not feed NULL to "%.*s" even with precision 0
diff --git a/setup.c b/setup.c
@@ -102,7 +102,7 @@ char *prefix_path_gently(const char *prefix, int len,
 			return NULL;
 		}
 	} else {
-		sanitized = xstrfmt("%.*s%s", len, prefix, path);
+		sanitized = xstrfmt("%.*s%s", len, len ? prefix : "", path);
 		if (remaining_prefix)
 			*remaining_prefix = len;
 		if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ char prefix_path_gently(const char prefix, int len,`
`102`	`102`	`return NULL;`
`103`	`103`	`}`
`104`	`104`	`} else {`
`105`		`- sanitized = xstrfmt("%.*s%s", len, prefix, path);`
	`105`	`+ sanitized = xstrfmt("%.*s%s", len, len ? prefix : "", path);`
`106`	`106`	`if (remaining_prefix)`
`107`	`107`	`*remaining_prefix = len;`
`108`	`108`	`if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) {`