[Qemu-trivial] [PATCH] slirp: workaround gcc __warn_memset_zero_len warnings

[Alon Levy]

Fixes __warn_memset_zero_len warnings with gcc --version
gcc (GCC) 4.7.0 20120208 (Red Hat 4.7.0-0.12)

Caused by an overly protective memset check to avoid transposition of
the fill value and length parameters.

Signed-off-by: Alon Levy <address@hidden>
---
 slirp/misc.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/slirp/misc.c b/slirp/misc.c
index 3432fbf..17c21e2 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -358,7 +358,9 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
             dst_port = so->so_fport;
         }
         n = snprintf(buf, sizeof(buf), "  TCP[%s]", state);
-        memset(&buf[n], ' ', 19 - n);
+        if (n < 19) {
+            memset(&buf[n], ' ', 19 - n);
+        }
         buf[19] = 0;
         monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
                        src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
@@ -383,7 +385,9 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
             dst_addr = so->so_faddr;
             dst_port = so->so_fport;
         }
-        memset(&buf[n], ' ', 19 - n);
+        if (n < 19) {
+            memset(&buf[n], ' ', 19 - n);
+        }
         buf[19] = 0;
         monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
                        src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
-- 
1.7.9.1