3297. [bug] Named could die on a malformed master file. [RT #28467]

diff --git a/CHANGES b/CHANGES
index fe51c4e420badf5f370da50f6749581e28cc2831..78d5ec18f7c8b21543af8ede56ffc3dd23c9d52d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3297.  [bug]           Named could die on a malformed master file. [RT #28467]
+
 3295.  [bug]           Adjust isc_time_secondsastimet range check to be more
                        portable. [RT # 26542]
 

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 81363036bbdba8efd01abe71f5428726349f0d70..150e2eaa1bc5511255e4e1aa19b04a8db3e2444b 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -610,8 +610,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
        if (result != ISC_R_SUCCESS) {
                name = isc_lex_getsourcename(lexer);
                line = isc_lex_getsourceline(lexer);
-               fromtext_error(callback, callbacks, name, line,
-                              &token, result);
+               fromtext_error(callback, callbacks, name, line, NULL, result);
                return (result);
        }