[v4_1_esv] Allow the ADD token to be used as a hex string in IPv6 address

Allow the ADD token to be used as a hex string in IPv6 address

diff --git a/RELNOTES b/RELNOTES
index d9fe4d91c1634e36342ff5afc60ca20df5ffec63..192a5edcbeb65ce51cef1acf63933a56b184f0bf 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -104,6 +104,10 @@ by Eric Young (eay@cryptsoft.com).
   the issue and suggesting the patch.
   [ISC-Bugs #38631]
 
+- While parsing IPv6 addresses treat "add" as part of the address instead
+  of as a token.
+  [ISC-Bugs #39529]
+
                        Changes since 4.1-ESV-R11rc2
 
 - None

diff --git a/common/parse.c b/common/parse.c
index 1407cdb0c56fcec9d626d4a86a0a19cb16308441..50c363b7584eef167d7bfa3882d9ee99c85a0544 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -384,10 +384,11 @@ parse_ip6_addr(struct parse *cfile, struct iaddr *addr) {
         */
        v6_len = 0;
        for (;;) {
-               if ((((token == NAME) || (token == NUMBER_OR_NAME)) && 
+               if ((((token == NAME) || (token == NUMBER_OR_NAME)) &&
                     is_hex_string(val)) ||
-                   (token == NUMBER) || 
-                   (token == DOT) || 
+                   (token == NUMBER) ||
+                   (token == TOKEN_ADD) ||
+                   (token == DOT) ||
                    (token == COLON)) {
 
                        next_raw_token(&val, NULL, cfile);