upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 15:50:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Updated sldns_bget_token_par fix for also space for the zero

Browse source 
delimiter after the character.
This commit is contained in:
W.C.A. Wijngaards 2020-01-08 11:55:42 +01:00
parent 05a5dc2d0d
commit 5ae1544583
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -2,6 +2,8 @@
- Fix 'make test' to work for --disable-sha1 configure option. - Fix 'make test' to work for --disable-sha1 configure option.
- Fix out-of-bounds null-byte write in sldns_bget_token_par while - Fix out-of-bounds null-byte write in sldns_bget_token_par while
parsing type WKS, reported by Luis Merino from X41 D-Sec. parsing type WKS, reported by Luis Merino from X41 D-Sec.
- Updated sldns_bget_token_par fix for also space for the zero
delimiter after the character.
6 January 2020: George 6 January 2020: George
- Downgrade compat/getentropy_solaris.c to version 1.4 from OpenBSD. - Downgrade compat/getentropy_solaris.c to version 1.4 from OpenBSD.

11
sldns/parse.c
View file

@ -120,7 +120,7 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
if (line_nr) { if (line_nr) {
*line_nr = *line_nr + 1; *line_nr = *line_nr + 1;
} }
if (limit > 0 && (i > limit || (size_t)(t-token) > limit)) { if (limit > 0 && (i+1 > limit || (size_t)(t-token)+1 > limit)) {
*t = '\0'; *t = '\0';
return -1; return -1;
} }
@ -141,7 +141,8 @@ sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *l
if (c != '\0' && c != '\n') { if (c != '\0' && c != '\n') {
i++; i++;
} }
if (limit > 0 && (i > limit || (size_t)(t-token) > limit)) { /* is there space for the character and the zero after it */
if (limit > 0 && (i+1 > limit || (size_t)(t-token)+1 > limit)) {
*t = '\0'; *t = '\0';
return -1; return -1;
} }
@ -326,8 +327,8 @@ sldns_bget_token_par(sldns_buffer *b, char *token, const char *delim,
/* in parentheses */ /* in parentheses */
/* do not write ' ' if we want to skip spaces */ /* do not write ' ' if we want to skip spaces */
if(!(skipw && (strchr(skipw, c)||strchr(skipw, ' ')))) { if(!(skipw && (strchr(skipw, c)||strchr(skipw, ' ')))) {
/* check for space for the space character */ /* check for space for the space character and a zero delimiter after that. */
if (limit > 0 && (i > limit || (size_t)(t-token) > limit)) { if (limit > 0 && (i+1 > limit || (size_t)(t-token)+1 > limit)) {
*t = '\0'; *t = '\0';
return -1; return -1;
} }
@ -354,7 +355,7 @@ sldns_bget_token_par(sldns_buffer *b, char *token, const char *delim,
} }
i++; i++;
if (limit > 0 && (i > limit || (size_t)(t-token) > limit)) { if (limit > 0 && (i+1 > limit || (size_t)(t-token)+1 > limit)) {
*t = '\0'; *t = '\0';
return -1; return -1;
} }