From 79345cc0b9670346690e2551cdad84a97cdc09fc Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 1 Aug 2019 11:04:05 +0930 Subject: [PATCH] CCAN: update to suppress path_readlink warning. Reported-by: Chirimen-Jako Signed-off-by: Rusty Russell --- ccan/README | 2 +- ccan/ccan/tal/path/path.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ccan/README b/ccan/README index 399d33655..72b737b65 100644 --- a/ccan/README +++ b/ccan/README @@ -1,3 +1,3 @@ CCAN imported from http://ccodearchive.net. -CCAN version: init-2483-g920ca95d +CCAN version: init-2484-ge16aa40b diff --git a/ccan/ccan/tal/path/path.c b/ccan/ccan/tal/path/path.c index b50120667..75894240b 100644 --- a/ccan/ccan/tal/path/path.c +++ b/ccan/ccan/tal/path/path.c @@ -302,7 +302,7 @@ fail_take_to: char *path_readlink(const tal_t *ctx, const char *linkname) { - ssize_t len, maxlen = 64; /* good first guess. */ + ssize_t maxlen = 64; /* good first guess. */ char *ret = NULL; if (unlikely(!linkname) && is_taken(linkname)) @@ -311,19 +311,20 @@ fail_take_to: ret = tal_arr(ctx, char, maxlen + 1); while (ret) { - len = readlink(linkname, ret, maxlen); + ssize_t len = readlink(linkname, ret, maxlen); + if (len < 0) goto fail; - if (len < maxlen) + + if (len < maxlen) { + ret[len] = '\0'; break; + } if (!tal_resize(&ret, maxlen *= 2 + 1)) goto fail; } - if (ret) - ret[len] = '\0'; - out: if (taken(linkname)) tal_free(linkname);