[Qemu-devel] [6843] Replace asprintf() with snprintf() in vnc.c ("Daniel P.

[Qemu-devel] [6843] Replace asprintf() with snprintf() in vnc.c ("Daniel P.

[Anthony Liguori]

Revision: 6843
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6843
Author:   aliguori
Date:     2009-03-13 15:03:27 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Replace asprintf() with snprintf() in vnc.c ("Daniel P. Berrange")

As previously discussed, this patch removes the non-portable use of
asprintf(), replacing it with malloc+snprintf instead

   Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/vnc.c

Modified: trunk/vnc.c
===================================================================
--- trunk/vnc.c	2009-03-13 15:02:28 UTC (rev 6842)
+++ trunk/vnc.c	2009-03-13 15:03:27 UTC (rev 6843)
@@ -53,6 +53,7 @@
     char host[NI_MAXHOST];
     char serv[NI_MAXSERV];
     int err;
+    size_t addrlen;
 
     if ((err = getnameinfo((struct sockaddr *)sa, salen,
                            host, sizeof(host),
@@ -63,8 +64,12 @@
         return NULL;
     }
 
-    if (asprintf(&addr, format, host, serv) < 0)
-        return NULL;
+    /* Enough for the existing format + the 2 vars we're
+     * subsituting in. */
+    addrlen = strlen(format) + strlen(host) + strlen(serv);
+    addr = qemu_malloc(addrlen + 1);
+    snprintf(addr, addrlen, format, host, serv);
+    addr[addrlen] = '\0';
 
     return addr;
 }