Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix for portmapper analyzer segfaulting when parsing portmap dump

Browse source 
replies. (Gregor Maier)

Closes #332.
This commit is contained in:
Robin Sommer 2011-01-10 12:19:13 -08:00
parent f228e32679
commit 06bd8baef6
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/portmap-analyzer.pac
View file

@ -79,6 +79,10 @@ function PortmapBuildDumpVal(params: PortmapDumpResults): BroVal
for ( int i = 0; i < params->size(); ++i ) for ( int i = 0; i < params->size(); ++i )
{ {
// The last element has cont()!=1 and this element doesn't contain a
// mapping.
if ((*params)[i]->cont() != 1)
continue;
Val* m = PortmapBuildMappingVal((*params)[i]->mapping()); Val* m = PortmapBuildMappingVal((*params)[i]->mapping());
Val* index = new Val(i + 1, TYPE_COUNT); Val* index = new Val(i + 1, TYPE_COUNT);
mappings->Assign(index, m); mappings->Assign(index, m);

1
src/portmap-protocol.pac
View file

@ -68,6 +68,7 @@ type PortmapDumpEntry = record {
}; };
}; };
# The final element that has cont!=1 will be included in the array.
type PortmapDumpResults = PortmapDumpEntry[] &until($element.cont != 1); type PortmapDumpResults = PortmapDumpEntry[] &until($element.cont != 1);
type PortmapCallItResults = record { type PortmapCallItResults = record {