[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] slirp: Clean up net_slirp_hostfwd_remove()'s us
From: |
Jan Kiszka |
Subject: |
Re: [Qemu-devel] [PATCH] slirp: Clean up net_slirp_hostfwd_remove()'s use of get_str_sep() |
Date: |
Fri, 18 Nov 2011 10:42:48 -0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
On 2011-11-16 12:45, Markus Armbruster wrote:
> 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 <address@hidden>
Acked-by: Jan Kiszka <address@hidden>
Stefan, can you take this? My slirp queue not fully "operative" ATM down
here in Brazil.
Thanks,
Jan
> ---
> 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;
signature.asc
Description: OpenPGP digital signature