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

                        [RT #22521]

diff --git a/CHANGES b/CHANGES
index 5e9ff747a5d76cc9c9377423f63b7a1b0ac38335..ab5e792f70169893f1a3983dac280fa65913f5cf 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..d3ab3a32408aa51dc1dd8479aecf6deefea4f428 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.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.
         */