From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Li8v4-00016X-Jc
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 11:03:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Li8v3-00015F-QG
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 11:03:30 -0400
Received: from [199.232.76.173] (port=40794 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Li8v3-000151-KJ
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 11:03:29 -0400
Received: from savannah.gnu.org ([199.232.41.3]:41752 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1Li8v3-000840-6d
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 11:03:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Li8v2-0008BX-JB
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 15:03:28 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1Li8v2-0008BT-9y
	for qemu-devel@nongnu.org; Fri, 13 Mar 2009 15:03:28 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1Li8v2-0008BT-9y@cvs.savannah.gnu.org>
Date: Fri, 13 Mar 2009 15:03:28 +0000
Subject: [Qemu-devel] [6843] Replace asprintf() with snprintf() in vnc.c
	("Daniel P.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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;
 }