Fix ZAM memory leak as reported in #2634

This commit is contained in:
Vern Paxson 2023-01-09 12:07:49 +01:00 committed by Arne Welzel
parent e12baf08a7
commit 450f6a97c8

View file

@ -2207,15 +2207,18 @@ macro Cat1Op(val)
auto& v1 = frame[z.v1]; auto& v1 = frame[z.v1];
ZVal::DeleteManagedType(v1); ZVal::DeleteManagedType(v1);
v1 = val; v1 = val;
macro Cat1OpRef(val)
Cat1Op(val)
zeek::Ref(v1.string_val); zeek::Ref(v1.string_val);
internal-op Cat1 internal-op Cat1
type VC type VC
eval Cat1Op(z.c) eval Cat1OpRef(z.c)
internal-op Cat1 internal-op Cat1
type VV type VV
eval Cat1Op(frame[z.v2]) eval Cat1OpRef(frame[z.v2])
macro Cat1FullVal(val) macro Cat1FullVal(val)
Cat1Op(ZVal(ZAM_val_cat(val.ToVal(z.t)))) Cat1Op(ZVal(ZAM_val_cat(val.ToVal(z.t))))