mirrors/bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4 synced 2025-02-28 08:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct handling for too large sources list

Browse Source
This commit is contained in:
Alexandre Snarskii
2017-07-19 20:43:53 +03:00
parent f8450f6944
commit aed955f868
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
untagged yet (2017-07-19)
- too large (>124bytes) sources list was not handled correctly.
Reported by Pier Carlo Chiodi.
0.1.35-rc2 (2017-06-14) 0.1.35-rc2 (2017-06-14)
- OpenBSD need <sys/select.h>. Reported by Denis Fondras. - OpenBSD need <sys/select.h>. Reported by Denis Fondras.
- OpenBGPD output shall not emit 'deny any from any' in case of empty - OpenBGPD output shall not emit 'deny any from any' in case of empty

9
bgpq_expander.c
View File

@@ -769,12 +769,15 @@ bgpq_expand(struct bgpq_expander* b)
}; };
if(b->sources && b->sources[0]!=0) { if(b->sources && b->sources[0]!=0) {
char sources[128]; int slen = strlen(b->sources)+4;
if (slen < 128)
slen = 128;
char sources[slen];
snprintf(sources,sizeof(sources),"!s%s\n", b->sources); snprintf(sources,sizeof(sources),"!s%s\n", b->sources);
SX_DEBUG(debug_expander,"Requesting sources %s", sources); SX_DEBUG(debug_expander,"Requesting sources %s", sources);
write(fd, sources, strlen(sources)); write(fd, sources, strlen(sources));
memset(sources, 0, sizeof(sources)); memset(sources, 0, slen);
read(fd, sources, sizeof(sources)); read(fd, sources, slen);
SX_DEBUG(debug_expander,"Got answer %s", sources); SX_DEBUG(debug_expander,"Got answer %s", sources);
if(sources[0]!='C') { if(sources[0]!='C') {
sx_report(SX_ERROR, "Invalid source(s) '%s': %s\n", b->sources, sx_report(SX_ERROR, "Invalid source(s) '%s': %s\n", b->sources,