3028. [bug] isc_sockaddr_format() handle a zero sized buffer.

                        [RT #22521]

diff --git a/CHANGES b/CHANGES
index 6e29b53e4e350ab20a8a1bdb5822a20dd5ff6eaa..837d99f8536d795ae10bce68ab57d62eb841db34 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3028.  [bug]           isc_sockaddr_format() handle a zero sized buffer.
+                       [RT #22521]
+
 3027.  [bug]           Add documented REQUIREs to cfg_obj_asnetprefix() to
                        catch NULL pointer dereferences before they happen.
                        [RT #22521]

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index d2d27f3969bbbc79554a1de75ae76ebb43a77983..41108350cd1a4e18ddff7385585960c4923b42a6 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.73 2010/11/17 23:47:09 tbox Exp $ */
+/* $Id: sockaddr.c,v 1.73.38.1 2011/02/21 06:21:24 marka Exp $ */
 
 /*! \file */
 
@@ -182,6 +182,9 @@ isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size) {
        isc_result_t result;
        isc_buffer_t buf;
 
+       if (size == 0U)
+               return;
+
        isc_buffer_init(&buf, array, size);
        result = isc_sockaddr_totext(sa, &buf);
        if (result != ISC_R_SUCCESS) {