pullup:

1186.   [bug]           isc_hex_tobuffer(,,length = 0) failed to unget the
                        EOL token when reading to end of line.

diff --git a/CHANGES b/CHANGES
index 9c0a3b33e1ad9570159f63f0455b65ed8b134861..77626da49ed5fc7d7807d810f7476532c52757e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1186.   [bug]           isc_hex_tobuffer(,,length = 0) failed to unget the
+                        EOL token when reading to end of line.
+
 1182.  [bug]           The server could throw an assertion failure when
                        constructing a negative response packet.
 

diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index 84a608f2a251d04949c641c6d41492d88c24114a..2493f656a1bba2c9c238d05207dfdef5d848aa12 100644 (file)
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hex.c,v 1.8 2001/03/22 00:07:05 bwelling Exp $ */
+/* $Id: hex.c,v 1.8.2.1 2002/01/22 06:08:47 marka Exp $ */
 
 #include <config.h>
 
@@ -147,6 +147,8 @@ isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) {
                for (i = 0 ;i < tr->length; i++)
                        RETERR(hex_decode_char(&ctx, tr->base[i]));
        }
+       if (ctx.length < 0)
+               isc_lex_ungettoken(lexer, &token);
        RETERR(hex_decode_finish(&ctx));
        return (ISC_R_SUCCESS);
 }