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

Merge remote-tracking branch 'origin/topic/vern/zam-any-coerce-leak'

Browse source 
* origin/topic/vern/zam-any-coerce-leak:
  Fixed ZAM memory leak when coercing values to "any"
This commit is contained in:
Arne Welzel 2024-11-08 18:36:07 +01:00
commit 346a9233da
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.1.0-dev.478 | 2024-11-08 18:36:07 +0100
* Fixed ZAM memory leak when coercing values to "any" (Vern Paxson, Corelight)
* ci: Remove -b from test_script lines for zam tasks (Arne Welzel, Corelight)
7.1.0-dev.475 | 2024-11-08 15:35:00 +0100 7.1.0-dev.475 | 2024-11-08 15:35:00 +0100
* fixes for ZAM's propagation of control flow information for some degenerate constructs (Vern Paxson, Corelight) * fixes for ZAM's propagation of control flow information for some degenerate constructs (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.475 7.1.0-dev.478

4
src/script_opt/ZAM/OPs/coercions.op
View file

@ -128,7 +128,9 @@ eval if ( $1->Size() > 0 )
unary-expr-op To-Any-Coerce unary-expr-op To-Any-Coerce
op-type X op-type X
set-type $1 set-type $1
eval AssignTarget($$, ZVal($1.ToVal(Z_TYPE), ZAM::any_base_type)) eval auto orig_lhs = $$; /* hold in case $$ = $1 */
$$ = ZVal($1.ToVal(Z_TYPE), ZAM::any_base_type);
ZVal::DeleteManagedType(orig_lhs);
unary-expr-op From-Any-Coerce unary-expr-op From-Any-Coerce
no-const no-const