Fixing memory leak in changed table expiration code.

This commit is contained in:
Robin Sommer 2016-06-15 09:05:09 -07:00
parent 4035af4b12
commit b698cfc2ce
3 changed files with 19 additions and 2 deletions

15
CHANGES
View file

@ -1,4 +1,19 @@
2.4-620 | 2016-06-15 09:05:37 -0700
* Fixing memory leak in changed table expiration code. (Robin
Sommer)
* Fixing test portability. (Robin Sommer)
* Move the HTTP "filename" field (which was never filled out
anyways) to "orig_filenames" and "resp_filenames". (Seth Hall)
* Add a round trip time (rtt) field to dns.log. (Seth Hall)
* Add ACE archive files to the identified file types. Addresses
BIT-1609. (Stephen Hosom)
2.4-613 | 2016-06-14 18:10:37 -0700 2.4-613 | 2016-06-14 18:10:37 -0700
* Preventing the event processing from looping endlessly when an * Preventing the event processing from looping endlessly when an

View file

@ -1 +1 @@
2.4-613 2.4-620

View file

@ -2274,8 +2274,10 @@ double TableVal::GetExpireTime()
return -1; return -1;
Val* timeout = expire_time->Eval(0); Val* timeout = expire_time->Eval(0);
double interval = (timeout ? timeout->AsInterval() : -1);
Unref(timeout);
if ( timeout && (timeout->AsInterval() >= 0) ) if ( interval >= 0 )
return timeout->AsInterval(); return timeout->AsInterval();
expire_time = 0; expire_time = 0;