pullup:

1048.   [bug]           Servers built with -DISC_MEM_USE_INTERNAL_MALLOC=1
                        didn't work.

diff --git a/CHANGES b/CHANGES
index c13605bc6014049823af2e3fa87a46aec0dc3207..bbcee9fdc5d3401e2eb2666fa284d7684760b060 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1048.  [bug]           Servers built with -DISC_MEM_USE_INTERNAL_MALLOC=1
+                       didn't work.
+
 1047.  [bug]           When a request was refused due to being signed with
                        a TSIG key derived from an unsigned TKEY negotiation,
                        the response could have an rcode of SUCCESS rather

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 2930a0854962bc7f088d7bf57e29dff5d043f883..b60e0ab8a55e83ba154f4f1c5d815705e0b53eac 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.98.2.1 2001/09/05 17:51:13 gson Exp $ */
+/* $Id: mem.c,v 1.98.2.2 2001/10/12 01:17:37 marka Exp $ */
 
 #include <config.h>
 
@@ -475,6 +475,7 @@ mem_getunlocked(isc_mem_t *ctx, size_t size) {
                 * don't own.
                 */
                new_size = size;
+               goto done;
        }
 
        /*