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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-1200'

Browse source 
* origin/topic/jsiwek/gh-1200:
  GH-1200: ignore a maybe-uninitialized warning
This commit is contained in:
Jon Siwek 2020-10-08 12:07:42 -07:00
commit b3c5e9adbb
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.377 | 2020-10-08 12:07:42 -0700
* GH-1200: ignore a maybe-uninitialized warning (Jon Siwek, Corelight)
3.3.0-dev.374 | 2020-10-07 10:44:11 -0700 3.3.0-dev.374 | 2020-10-07 10:44:11 -0700
* Fix multipart MIME leak of sub-part found after closing-boundary (Jon Siwek, Corelight) * Fix multipart MIME leak of sub-part found after closing-boundary (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.374 3.3.0-dev.377

3
src/Val.cc
View file

@ -2192,7 +2192,10 @@ void TableVal::SendToStore(const Val* index, const TableEntryVal* new_entry_val,
case ELEMENT_NEW: case ELEMENT_NEW:
case ELEMENT_CHANGED: case ELEMENT_CHANGED:
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
broker::optional<broker::timespan> expiry; broker::optional<broker::timespan> expiry;
#pragma GCC diagnostic pop
auto expire_time = GetExpireTime(); auto expire_time = GetExpireTime();
if ( expire_time == 0 ) if ( expire_time == 0 )