WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-08-17 21:25:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix that fast_reload does not terminate the server for

Browse Source 
errors in config, for key files. Thanks to Qifan Zhang,
  Palo Alto Networks, for the report.
This commit is contained in:
W.C.A. Wijngaards
2026-06-15 16:31:37 +02:00
parent 06da5d45a3
commit fc09352df6
6 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
validator/val_anchor.c
+19 -6
View File
@@ -534,7 +534,10 @@ readkeyword_bindfile(FILE* in, sldns_buffer* buf, int* line, int comments)
while((c = getc(in)) != EOF ) {
if(comments && c == '#') { /* # blabla */
skip_to_eol(in, &c);
if(c == EOF) return 0;
if(c == EOF) {
log_err("trusted-keys, %d, got EOF", *line);
return 0;
}
(*line)++;
continue;
} else if(comments && c=='/' && numdone>0 && /* /_/ bla*/
@@ -543,7 +546,10 @@ readkeyword_bindfile(FILE* in, sldns_buffer* buf, int* line, int comments)
sldns_buffer_skip(buf, -1);
numdone--;
skip_to_eol(in, &c);
if(c == EOF) return 0;
if(c == EOF) {
log_err("trusted-keys, %d, got EOF", *line);
return 0;
}
(*line)++;
continue;
} else if(comments && c=='*' && numdone>0 && /* /_* bla *_/ */
@@ -560,7 +566,10 @@ readkeyword_bindfile(FILE* in, sldns_buffer* buf, int* line, int comments)
if(c == '\n')
(*line)++;
}
if(c == EOF) return 0;
if(c == EOF) {
log_err("trusted-keys, %d, got EOF", *line);
return 0;
}
continue;
}
/* not a comment, complete the keyword */
@@ -581,7 +590,8 @@ readkeyword_bindfile(FILE* in, sldns_buffer* buf, int* line, int comments)
}
/* space for 1 char + 0 string terminator */
if(sldns_buffer_remaining(buf) < 2) {
fatal_exit("trusted-keys, %d, string too long", *line);
log_err("trusted-keys, %d, string too long", *line);
return 0;
}
sldns_buffer_write_u8(buf, (uint8_t)c);
numdone++;
@@ -595,7 +605,10 @@ readkeyword_bindfile(FILE* in, sldns_buffer* buf, int* line, int comments)
break;
}
}
if(c == EOF) return 0;
if(c == EOF) {
log_err("trusted-keys, %d, got EOF", *line);
return 0;
}
return numdone;
}
if(is_bind_special(c))
@@ -623,7 +636,7 @@ skip_to_special(FILE* in, sldns_buffer* buf, int* line, int spec)
}
return 1;
}
log_err("trusted-keys, line %d, expected %c got EOF", *line, spec);
log_err("trusted-keys, line %d, expected %c, read failed", *line, spec);
return 0;
}