From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Mon, 21 Oct 2019 12:59:24 +0000 (+0000)
Subject: main: exec_self: make clang analyzer happy
X-Git-Url: http://git.openwrt.org/openwrt/static/git-logo.png?a=commitdiff_plain;h=ee26d83e983f93333b9d5147285cb902bb6cc737;p=project%2Frpcd.git

main: exec_self: make clang analyzer happy

Prevent a theoretical leak of the args memory when the executable path
cannot be found.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
[fix whitespace, commit description]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/main.c b/main.c
index 1db3241..9a177cf 100644
--- a/main.c
+++ b/main.c
@@ -47,10 +47,15 @@ static void
 exec_self(int argc, char **argv)
 {
 	int i;
-	const char *cmd = rpc_exec_lookup(argv[0]);
-	char **args = calloc(argc + 1, sizeof(char *));
+	const char *cmd;
+	char **args;
 
-	if (!cmd || !args)
+	cmd = rpc_exec_lookup(argv[0]);
+	if (!cmd)
+		return;
+
+	args = calloc(argc + 1, sizeof(char *));
+	if (!args)
 		return;
 
 	for (i = 0; i < argc; i++)