tal/path: fix unset vars in error paths.

[ccan] / ccan / tal / path / path.c

diff --git a/ccan/tal/path/path.c b/ccan/tal/path/path.c
index 0ad168c872d219d3b485e23d53d39ab430d40eb7..a0dbe291440e248fba0faddf6a70bf0062c0c009 100644 (file)
--- a/ccan/tal/path/path.c
+++ b/ccan/tal/path/path.c
@@ -244,8 +244,10 @@ char *path_rel(const tal_t *ctx, const char *from, const char *to)
 
        /* This frees to if we're supposed to take it. */
        cto = path_canon(tmpctx, to);
-       if (!cto)
+       if (!cto) {
+               ret = NULL;
                goto out;
+       }
 
        /* How much is in common? */
        for (common = i = 0; cfrom[i] && cto[i]; i++) {
@@ -323,7 +325,9 @@ fail_take_to:
                        goto fail;
        }
 
-       ret[len] = '\0';
+       if (ret)
+               ret[len] = '\0';
+
 out:
        if (taken(linkname))
                tal_free(linkname);
@@ -525,7 +529,7 @@ bool path_is_dir(const char *path)
 char **path_split(const tal_t *ctx, const char *path)
 {
        bool empty = path && !path[0];
-       char **ret = strsplit(ctx, path, PATH_SEP_STR, STR_NO_EMPTY);
+       char **ret = tal_strsplit(ctx, path, PATH_SEP_STR, STR_NO_EMPTY);
 
        /* Handle the "/" case */
        if (ret && !empty && !ret[0]) {