trace.c: ensure NULL is not passed to printf

GNU printf, and many others, will print the string "(null)" if a NULL pointer is passed as the argument to a "%s" format specifier. Some implementations (like on Solaris) do not detect a NULL pointer and will produce a segfault in this case. So, fix this by ensuring that pointer variables do not contain the value NULL. Assign the string "(null)" to the variables are NULL. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Brandon Casey committed Jan 5, 2011 at 18:30 UTC e83c267f71dfef72926807cd69aa8d570e57714e

1 file changed +8 -1

trace.c

+8 -1

@@ -154,6 +154,7 @@ static const char *quote_crnl(const char *path)

154 /* FIXME: move prefix to startup_info struct and get rid of this arg */

155 void trace_repo_setup(const char *prefix)

156 {

157 + const char *git_work_tree;

158 char cwd[PATH_MAX];

159 char *trace = getenv("GIT_TRACE");

160

@@ -164,8 +165,14 @@ void trace_repo_setup(const char *prefix)

165 if (!getcwd(cwd, PATH_MAX))

166 die("Unable to get current working directory");

167

168 + if (!(git_work_tree = get_git_work_tree()))

169 + git_work_tree = "(null)";

170 +

171 + if (!prefix)

172 + prefix = "(null)";

173 +

174 trace_printf("setup: git_dir: %s\n", quote_crnl(get_git_dir()));

168 - trace_printf("setup: worktree: %s\n", quote_crnl(get_git_work_tree()));

175 + trace_printf("setup: worktree: %s\n", quote_crnl(git_work_tree));

176 trace_printf("setup: cwd: %s\n", quote_crnl(cwd));

177 trace_printf("setup: prefix: %s\n", quote_crnl(prefix));

178 }