From 8e5719b37a67925674bb3c5524a1ad3fa138a064 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Sun, 11 Oct 2020 10:45:15 +0200 Subject: [PATCH] Fix warnings reported by clang-10 static analyzer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes following warnings: testing/include/libubox/blobmsg.h:222:67: warning: Null pointer passed to 1st parameter expecting 'nonnull' return blobmsg_add_field(buf, BLOBMSG_TYPE_STRING, name, string, strlen(string) + 1); ^~~~~~~~~~~~~~ cgi-io/main.c:407:4: warning: Null pointer passed to 1st parameter expecting 'nonnull' unlink(st.filename); ^~~~~~~~~~~~~~~~~~~ cgi-io/main.c:876:26: warning: Null pointer passed to 1st parameter expecting 'nonnull' size_t plen = 0, clen = strlen(cmd) + 1; ^~~~~~~~~~~ Signed-off-by: Petr Å tetiar --- main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 549121f..64f474f 100644 --- a/main.c +++ b/main.c @@ -109,7 +109,7 @@ session_access(const char *sid, const char *scope, const char *obj, const char * ctx = ubus_connect(NULL); - if (!ctx || ubus_lookup_id(ctx, "session", &id)) + if (!ctx || !obj || ubus_lookup_id(ctx, "session", &id)) goto out; blob_buf_init(&req, 0); @@ -403,7 +403,7 @@ response(bool success, const char *message) printf("\t\"failure\": [ %u, \"%s\" ]\n", errno, strerror(errno)); - if (st.filefd > -1) + if (st.filefd > -1 && st.filename) unlink(st.filename); } @@ -873,11 +873,16 @@ main_backup(int argc, char **argv) static const char * lookup_executable(const char *cmd) { - size_t plen = 0, clen = strlen(cmd) + 1; + size_t plen = 0, clen; static char path[PATH_MAX]; char *search, *p; struct stat s; + if (!cmd) + return NULL; + + clen = strlen(cmd) + 1; + if (!stat(cmd, &s) && S_ISREG(s.st_mode)) return cmd; -- 2.30.2