- Fix #426: nsd crashes with patterns in config_apply_pattern.

NLnetLabs · Jan 22, 2025 · c789096 · c789096
1 parent 9061b2d
commit c789096
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,6 @@
+22 January 2025: Wouter
+	- Fix #426: nsd crashes with patterns in config_apply_pattern.
+
 20 January 2025: Willem
 	- code repository continues with 4.11.2 under development.
 	- Fix re-enable to configure dns-cookies from config file, which was

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -5,6 +5,7 @@ NSD RELEASE NOTES
 BUG FIXES:
         - Fix re-enable to configure dns-cookies from config file, which was
           accidentally removed with the 4.11.1 release.
+	- Fix #426: nsd crashes with patterns in config_apply_pattern.
 
 4.11.1
 ================

diff --git a/options.c b/options.c
@@ -2773,8 +2773,8 @@ config_apply_pattern(struct pattern_options *dest, const char* name)
 		c_error("could not find pattern %s", name);
 		return;
 	}
-	if(strncmp(dest->pname, PATTERN_IMPLICIT_MARKER,
-				strlen(PATTERN_IMPLICIT_MARKER)) == 0
+	if( (!dest->pname || strncmp(dest->pname, PATTERN_IMPLICIT_MARKER,
+				strlen(PATTERN_IMPLICIT_MARKER)) == 0)
 	&& pat->catalog_producer_zone) {
 		c_error("patterns with an catalog-producer-zone option are to "
 		        "be used with \"nsd-control addzone\" only and cannot "