mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

parse_sockaddrsub() assumed current token was string

Browse Source 
token withouth checking that it actually was; reformatted for
80 columns
This commit is contained in:
Andreas Gustafsson
2001-03-06 19:13:01 +00:00
parent 7c294304af
commit 2c476880d6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/isccfg/parser.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: parser.c,v 1.42 2001/03/06 18:17:52 bwelling Exp $ */ /* $Id: parser.c,v 1.43 2001/03/06 19:13:01 gson Exp $ */
#include <config.h> #include <config.h>
@@ -3046,7 +3046,8 @@ parse_sockaddrsub(cfg_parser_t *pctx, cfg_type_t *type,
CHECK(create_cfgobj(pctx, type, &obj)); CHECK(create_cfgobj(pctx, type, &obj));
CHECK(get_addr(pctx, flags, &netaddr)); CHECK(get_addr(pctx, flags, &netaddr));
CHECK(cfg_peektoken(pctx, 0)); CHECK(cfg_peektoken(pctx, 0));
if (strcasecmp(pctx->token.value.as_pointer, "port") == 0) { if (pctx->token.type == isc_tokentype_string &&
strcasecmp(pctx->token.value.as_pointer, "port") == 0) {
CHECK(cfg_gettoken(pctx, 0)); /* read "port" */ CHECK(cfg_gettoken(pctx, 0)); /* read "port" */
CHECK(get_port(pctx, flags, &port)); CHECK(get_port(pctx, flags, &port));
} }
@@ -3264,12 +3265,16 @@ parse_logfile(cfg_parser_t *pctx, cfg_type_t *type, cfg_obj_t **ret) {
CHECK(cfg_peektoken(pctx, 0)); CHECK(cfg_peektoken(pctx, 0));
if (pctx->token.type == isc_tokentype_string) { if (pctx->token.type == isc_tokentype_string) {
CHECK(cfg_gettoken(pctx, 0)); CHECK(cfg_gettoken(pctx, 0));
if (strcasecmp(pctx->token.value.as_pointer, "versions") == 0 && if (strcasecmp(pctx->token.value.as_pointer,
"versions") == 0 &&
obj->value.tuple[1] == NULL) { obj->value.tuple[1] == NULL) {
CHECK(parse(pctx, fields[1].type, &obj->value.tuple[1])); CHECK(parse(pctx, fields[1].type,
} else if (strcasecmp(pctx->token.value.as_pointer, "size") == 0 && &obj->value.tuple[1]));
} else if (strcasecmp(pctx->token.value.as_pointer,
"size") == 0 &&
obj->value.tuple[2] == NULL) { obj->value.tuple[2] == NULL) {
CHECK(parse(pctx, fields[2].type, &obj->value.tuple[2])); CHECK(parse(pctx, fields[2].type,
&obj->value.tuple[2]));
} else { } else {
break; break;
} }