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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Add missing break; in StartTLS case of IRC analyzer.
This commit is contained in:
Robin Sommer 2016-02-13 10:48:21 -08:00
commit 9a7a024f6e
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.4-282 | 2016-02-13 10:48:21 -0800
* Add missing break in in StartTLS case of IRC analyzer. Found by
Aaron Eppert. (Johanna Amann)
2.4-280 | 2016-02-13 10:40:16 -0800 2.4-280 | 2016-02-13 10:40:16 -0800
* Fix memory leaks in stats.cc and smb.cc. (Johanna Amann) * Fix memory leaks in stats.cc and smb.cc. (Johanna Amann)

2
VERSION
View file

@ -1 +1 @@
2.4-280 2.4-282

2
aux/plugins

@ -1 +1 @@
Subproject commit a2f97d5760324b30897b7008b74a8312b7643853 Subproject commit d251af520ccdede694d7b3b7bcbc47df1080508c

1
src/analyzer/protocol/irc/IRC.cc
View file

@ -587,6 +587,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
case 670: case 670:
// StartTLS success reply to StartTLS // StartTLS success reply to StartTLS
StartTLS(); StartTLS();
break;
// All other server replies. // All other server replies.
default: default: