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

Fix error handling in decode_base64()

Browse source
This commit is contained in:
Jon Siwek 2019-11-04 09:58:53 -08:00
parent b6def63167
commit e34562df48
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.1.0-dev.242 | 2019-11-04 09:58:53 -0800
* Fix error handling in decode_base64() (Jon Siwek, Corelight)
3.1.0-dev.241 | 2019-11-04 09:44:20 -0800 3.1.0-dev.241 | 2019-11-04 09:44:20 -0800
* Revert recent changes to Base64.h API. (Jon Siwek, Corelight) * Revert recent changes to Base64.h API. (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.1.0-dev.241 3.1.0-dev.242

4
src/Base64.cc
View file

@ -230,7 +230,9 @@ BroString* decode_base64(const BroString* s, const BroString* a, Connection* con
char* rbuf2, *rbuf = new char[rlen]; char* rbuf2, *rbuf = new char[rlen];
Base64Converter dec(conn, a ? a->CheckString() : ""); Base64Converter dec(conn, a ? a->CheckString() : "");
if ( dec.Decode(s->Len(), (const char*) s->Bytes(), &rlen, &rbuf) == -1 ) dec.Decode(s->Len(), (const char*) s->Bytes(), &rlen, &rbuf);
if ( dec.Errored() )
goto err; goto err;
rlen2 = buf_len - rlen; rlen2 = buf_len - rlen;