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

Val: pass IntrusivePtr<> to TableVal::ExpandAndInit()

Browse source 
Clarifies ownership and fixes memory leaks.

Closes https://github.com/zeek/zeek/issues/811
This commit is contained in:
Max Kellermann 2020-02-22 11:01:59 +01:00
parent 48fba11c51
commit e2bf12d54a
3 changed files with 23 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Val.h
View file

@ -27,6 +27,7 @@ using std::string;
#define UDP_PORT_MASK 0x20000
#define ICMP_PORT_MASK 0x30000
template <class T> class IntrusivePtr;
template<typename T> class PDict;
class IterCookie;
@ -754,7 +755,7 @@ public:
// Expands any lists in the index into multiple initializations.
// Returns true if the initializations typecheck, false if not.
int ExpandAndInit(Val* index, Val* new_val);
int ExpandAndInit(IntrusivePtr<Val> index, IntrusivePtr<Val> new_val);
// Returns the element's value if it exists in the table,
// nil otherwise. Note, "index" is not const because we
@ -825,8 +826,8 @@ protected:
void Init(TableType* t);
void CheckExpireAttr(attr_tag at);
int ExpandCompoundAndInit(val_list* vl, int k, Val* new_val);
int CheckAndAssign(Val* index, Val* new_val);
int ExpandCompoundAndInit(val_list* vl, int k, IntrusivePtr<Val> new_val);
int CheckAndAssign(Val* index, IntrusivePtr<Val> new_val);
// Calculates default value for index. Returns 0 if none.
Val* Default(Val* index);