From: Vincent Bernat <bernat@luffy.cx>
Date: Fri, 22 Nov 2013 22:20:30 +0000 (+0100)
Subject: coverity: remove a theoritical memory leak
X-Git-Tag: 0.7.8~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddd75166dd41ea2f5643155bc8f8060472b50f09;p=thirdparty%2Flldpd.git

coverity: remove a theoritical memory leak

If cargc is 0, cargv should not have been allocated. However, to be more
robust, let's say this is possible and handle this case correctly.
---

diff --git a/src/client/lldpcli.c b/src/client/lldpcli.c
index 8d96fd06..5498c579 100644
--- a/src/client/lldpcli.c
+++ b/src/client/lldpcli.c
@@ -305,10 +305,12 @@ parse_and_exec(lldpctl_conn_t *conn, const char *fmt, const char *line)
 		log_warnx("lldpctl", "unmatched quotes");
 		return -1;
 	}
-	if (cargc == 0) return 0;
-	n = cmd_exec(conn, fmt, cargc, (const char **)cargv);
+	if (cargc != 0)
+		n = cmd_exec(conn, fmt, cargc, (const char **)cargv);
 	tokenize_free(cargc, cargv);
-	return (n == 0)?-1:1;
+	return (cargc == 0)?0:
+	    (n == 0)?-1:
+	    1;
 }
 
 static struct cmd_node*