- Fix #749: unbound-checkconf gets SIGSEGV when use against a

  malformatted conf file.

git-svn-id: file:///svn/unbound/trunk@3696 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 2a8d8bf6c4565ee0e692b237b55acfc108785dcc..e0b1fb8b3b0cf175beb9f86d35bba8a7beacb731 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 24 March 2016: Wouter
        - Document permit-small-holddown for 5011 debug.
+       - Fix #749: unbound-checkconf gets SIGSEGV when use against a
+         malformatted conf file.
 
 23 March 2016: Wouter
        - OpenSSL 1.1.0 portability, --disable-dsa configure option.

diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c
index 0feee032c960fcfb83b60b41f446e2065cd391cc..3e580ca355136a43674ba38579e7b69fc9792cf3 100644 (file)
--- a/iterator/iter_fwd.c
+++ b/iterator/iter_fwd.c
@@ -294,6 +294,7 @@ make_stub_holes(struct iter_forwards* fwd, struct config_file* cfg)
        uint8_t* dname;
        size_t dname_len;
        for(s = cfg->stubs; s; s = s->next) {
+               if(!s->name) continue;
                dname = sldns_str2wire_dname(s->name, &dname_len);
                if(!dname) {
                        log_err("cannot parse stub name '%s'", s->name);