From 450f6a97c839b52e38a77e1a189dbbaf0ffc3487 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Mon, 9 Jan 2023 12:07:49 +0100 Subject: [PATCH] Fix ZAM memory leak as reported in #2634 --- src/script_opt/ZAM/Ops.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/script_opt/ZAM/Ops.in b/src/script_opt/ZAM/Ops.in index f7cce292a0..c0d756d97d 100644 --- a/src/script_opt/ZAM/Ops.in +++ b/src/script_opt/ZAM/Ops.in @@ -2207,15 +2207,18 @@ macro Cat1Op(val) auto& v1 = frame[z.v1]; ZVal::DeleteManagedType(v1); v1 = val; + +macro Cat1OpRef(val) + Cat1Op(val) zeek::Ref(v1.string_val); internal-op Cat1 type VC -eval Cat1Op(z.c) +eval Cat1OpRef(z.c) internal-op Cat1 type VV -eval Cat1Op(frame[z.v2]) +eval Cat1OpRef(frame[z.v2]) macro Cat1FullVal(val) Cat1Op(ZVal(ZAM_val_cat(val.ToVal(z.t))))