From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Jun 2016 11:15:56 +0000 (+1000)
Subject: Revert "4384.   [bug]           isc_buffer_reallocate returns wrong result when passed"
X-Git-Tag: v9.11.0b1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c3be616f90de0c1a72f250d44744d9d1acae219;p=thirdparty%2Fbind9.git

Revert "4384.   [bug]           isc_buffer_reallocate returns wrong result when passed"

This reverts commit 01a0206c4050f79021f674d7710654451727fd4c.
---

diff --git a/CHANGES b/CHANGES
index febcb801123..4b8db33e571 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,3 @@
-4384.	[bug]		isc_buffer_reallocate returns wrong result when passed
-			a smaller length than what is already allocated.
-			[RT #42612]
-
 4383.	[bug]		Correct spelling error in stats channel description of
 			"EDNS client subnet option received". [RT #42633]
 
diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 751baf1fa60..c8cbdd5a5da 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -523,7 +523,7 @@ isc_buffer_reallocate(isc_buffer_t **dynbuffer, unsigned int length) {
 	REQUIRE((*dynbuffer)->mctx != NULL);
 
 	if ((*dynbuffer)->length > length)
-		return (ISC_R_SUCCESS);
+		return (ISC_R_NOSPACE);
 
 	/*
 	 * XXXMUKS: This is far more expensive than plain realloc() as