From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQgkZ-00033G-AT for qemu-devel@nongnu.org; Wed, 16 Nov 2011 09:46:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQgkT-0002wU-HE for qemu-devel@nongnu.org; Wed, 16 Nov 2011 09:46:07 -0500 Received: from oxygen.pond.sub.org ([78.46.104.156]:35865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQgkT-0002wI-7n for qemu-devel@nongnu.org; Wed, 16 Nov 2011 09:46:01 -0500 From: Markus Armbruster Date: Wed, 16 Nov 2011 15:45:59 +0100 Message-Id: <1321454759-19508-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] slirp: Clean up net_slirp_hostfwd_remove()'s use of get_str_sep() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com get_str_sep() can fail, but net_slirp_hostfwd_remove() doesn't check. Works, because it initializes buf[] to "", which get_str_sep() doesn't touch when it fails. Coverity doesn't like it, and neither do I. Change it to work exactly like slirp_hostfwd(). Signed-off-by: Markus Armbruster --- net/slirp.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index c6cda5d..6646ecb 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -305,7 +305,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict) { struct in_addr host_addr = { .s_addr = INADDR_ANY }; int host_port; - char buf[256] = ""; + char buf[256]; const char *src_str, *p; SlirpState *s; int is_udp = 0; @@ -325,11 +325,10 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict) return; } - if (!src_str || !src_str[0]) - goto fail_syntax; - p = src_str; - get_str_sep(buf, sizeof(buf), &p, ':'); + if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { + goto fail_syntax; + } if (!strcmp(buf, "tcp") || buf[0] == '\0') { is_udp = 0; -- 1.7.6.4