3029. [bug] isc_netaddr_format() handle a zero sized buffer.

                        [RT #22521]

diff --git a/CHANGES b/CHANGES
index 837d99f8536d795ae10bce68ab57d62eb841db34..aa3bf0d03b2290a0c864d4f1543026d24eb87332 100644 (file)
--- 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 dedffecf829582313b9e672d4ccfbfbc61300985..3051cdbba751d2f0ece5d42ab3b98c81afea3ee4 100644 (file)
--- 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.41.38.1 2011/02/21 06:32:19 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.
         */