upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-21 07:10:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix that stub-zone and forward-zone clauses do not exhaust memory

Browse source 
for long content.
This commit is contained in:
W.C.A. Wijngaards 2024-08-28 13:16:29 +02:00
parent b5951ce1fa
commit 42d421a305
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,6 +1,8 @@
28 August 2024: Wouter 28 August 2024: Wouter
- Fix that when rpz is applied the message does not get picked up by - Fix that when rpz is applied the message does not get picked up by
the validator. That stops validation failures for the message. the validator. That stops validation failures for the message.
- Fix that stub-zone and forward-zone clauses do not exhaust memory
for long content.
27 August 2024: Wouter 27 August 2024: Wouter
- Fix #1130: Loads of logs: "validation failure: key for validation - Fix #1130: Loads of logs: "validation failure: key for validation

40
util/configparser.y
View file

@ -210,8 +210,8 @@ extern struct config_parser_state* cfg_parser;
%% %%
toplevelvars: /* empty */ | toplevelvars toplevelvar ; toplevelvars: /* empty */ | toplevelvars toplevelvar ;
toplevelvar: serverstart contents_server | stubstart contents_stub | toplevelvar: serverstart contents_server | stub_clause |
forwardstart contents_forward | pythonstart contents_py | forward_clause | pythonstart contents_py |
rcstart contents_rc | dtstart contents_dt | view_clause | rcstart contents_rc | dtstart contents_dt | view_clause |
dnscstart contents_dnsc | cachedbstart contents_cachedb | dnscstart contents_dnsc | cachedbstart contents_cachedb |
ipsetstart contents_ipset | authstart contents_auth | ipsetstart contents_ipset | authstart contents_auth |
@ -348,6 +348,14 @@ content_server: server_num_threads | server_verbosity | server_port |
server_iter_scrub_ns | server_iter_scrub_cname | server_max_global_quota | server_iter_scrub_ns | server_iter_scrub_cname | server_max_global_quota |
server_harden_unverified_glue server_harden_unverified_glue
; ;
stub_clause: stubstart contents_stub
{
/* stub end */
if(cfg_parser->cfg->stubs &&
!cfg_parser->cfg->stubs->name)
yyerror("stub-zone without name");
}
;
stubstart: VAR_STUB_ZONE stubstart: VAR_STUB_ZONE
{ {
struct config_stub* s; struct config_stub* s;
@ -362,17 +370,19 @@ stubstart: VAR_STUB_ZONE
} }
} }
; ;
contents_stub: content_stub contents_stub contents_stub: contents_stub content_stub
| | ;
{
/* stub end */
if(cfg_parser->cfg->stubs &&
!cfg_parser->cfg->stubs->name)
yyerror("stub-zone without name");
};
content_stub: stub_name | stub_host | stub_addr | stub_prime | stub_first | content_stub: stub_name | stub_host | stub_addr | stub_prime | stub_first |
stub_no_cache | stub_ssl_upstream | stub_tcp_upstream stub_no_cache | stub_ssl_upstream | stub_tcp_upstream
; ;
forward_clause: forwardstart contents_forward
{
/* forward end */
if(cfg_parser->cfg->forwards &&
!cfg_parser->cfg->forwards->name)
yyerror("forward-zone without name");
}
;
forwardstart: VAR_FORWARD_ZONE forwardstart: VAR_FORWARD_ZONE
{ {
struct config_stub* s; struct config_stub* s;
@ -387,14 +397,8 @@ forwardstart: VAR_FORWARD_ZONE
} }
} }
; ;
contents_forward: content_forward contents_forward contents_forward: contents_forward content_forward
| | ;
{
/* forward end */
if(cfg_parser->cfg->forwards &&
!cfg_parser->cfg->forwards->name)
yyerror("forward-zone without name");
};
content_forward: forward_name | forward_host | forward_addr | forward_first | content_forward: forward_name | forward_host | forward_addr | forward_first |
forward_no_cache | forward_ssl_upstream | forward_tcp_upstream forward_no_cache | forward_ssl_upstream | forward_tcp_upstream
; ;