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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
Closes #1004. Great job tracking this down!

* origin/fastpath:
  Dangling pointer fix.  Addresses #1004.
  Sorry, that libmagic version actually might have some problems - at least on the linux distribution I have access to. So... it was a bad idea.
  accept libmagic starting from 5.03
This commit is contained in:
Robin Sommer 2013-05-28 21:37:46 -07:00
commit 965a26e447
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.1-664 | 2013-05-28 21:37:46 -0700
* Dangling pointer fix. Addresses #1004. (Jon Siwek)
2.1-659 | 2013-05-24 17:24:18 -0700 2.1-659 | 2013-05-24 17:24:18 -0700
* Fix broken/missing documentation. (Jon Siwek) * Fix broken/missing documentation. (Jon Siwek)

2
VERSION
View file

@ -1 +1 @@
2.1-659 2.1-664

4
src/Sessions.cc
View file

@ -1159,12 +1159,12 @@ Connection* NetSessions::NewConn(HashKey* k, double t, const ConnID* id,
if ( ! WantConnection(src_h, dst_h, tproto, flags, flip) ) if ( ! WantConnection(src_h, dst_h, tproto, flags, flip) )
return 0; return 0;
ConnID flip_id = *id;
if ( flip ) if ( flip )
{ {
// Make a guess that we're seeing the tail half of // Make a guess that we're seeing the tail half of
// an analyzable connection. // an analyzable connection.
ConnID flip_id = *id;
const IPAddr ta = flip_id.src_addr; const IPAddr ta = flip_id.src_addr;
flip_id.src_addr = flip_id.dst_addr; flip_id.src_addr = flip_id.dst_addr;
flip_id.dst_addr = ta; flip_id.dst_addr = ta;