From: Mark Andrews <marka@isc.org>
Date: Mon, 21 Feb 2011 06:30:06 +0000 (+0000)
Subject: 3029.   [bug]           isc_netaddr_format() handle a zero sized buffer.
X-Git-Tag: v9.7.3-P1~2^4~32
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4c577cbd1efc14156751e5b2ced7a866871a2f1a;p=thirdparty%2Fbind9.git

3029.   [bug]           isc_netaddr_format() handle a zero sized buffer.
                        [RT #22521]
---

diff --git a/CHANGES b/CHANGES
index 5e9ff747a5d..ab5e792f701 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3029.	[bug]		isc_netaddr_format() handle a zero sized buffer.
+			[RT #22521]
+
 3028.	[bug]		isc_sockaddr_format() handle a zero sized buffer.
 			[RT #22521]
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index dedffecf829..d3ab3a32408 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.41 2010/11/17 23:47:08 tbox Exp $ */
+/* $Id: netaddr.c,v 1.42 2011/02/21 06:30:06 marka Exp $ */
 
 /*! \file */
 
@@ -188,6 +188,9 @@ isc_netaddr_format(const isc_netaddr_t *na, char *array, unsigned int size) {
 	isc_buffer_init(&buf, array, size);
 	result = isc_netaddr_totext(na, &buf);
 
+	if (size == 0)
+		return;
+
 	/*
 	 * Null terminate.
 	 */