Commit 5079b95c authored by Joey Adams's avatar Joey Adams Committed by Rusty Russell

tools: Fixed unchecked *strrchr in a couple places.

tools/ccan_depends --compile ccan/module (without a trailing slash)
results in a segfault.
parent c67c37e8
......@@ -41,7 +41,8 @@ static void check_depends_exist(struct manifest *m,
char **deps;
char *updir = talloc_strdup(m, m->dir);
*strrchr(updir, '/') = '\0';
if (strrchr(updir, '/'))
*strrchr(updir, '/') = '\0';
if (safe_mode)
deps = get_safe_ccan_deps(m, m->dir, true,
......
......@@ -59,7 +59,8 @@ static char *compile_info(const void *ctx, const char *dir)
return NULL;
ccandir = talloc_dirname(ctx, dir);
*strrchr(ccandir, '/') = '\0';
if (strrchr(ccandir, '/'))
*strrchr(ccandir, '/') = '\0';
compiled = maybe_temp_file(ctx, "", false, "info");
if (compile_and_link(ctx, info_c_file, ccandir, "",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment