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

Merge remote-tracking branch 'origin/topic/jsiwek/bit-1373'

Browse source 
* origin/topic/jsiwek/bit-1373:
  BIT-1373: fix vector index assignment ref count bug.

BIT-1373 #merged
This commit is contained in:
Robin Sommer 2015-04-21 13:40:12 -07:00
commit 4e68ce4726
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.3-838 | 2015-04-21 13:40:12 -0700
* BIT-1373: Fix vector index assignment reference count bug. (Jon Siwek)
2.3-836 | 2015-04-21 13:37:31 -0700 2.3-836 | 2015-04-21 13:37:31 -0700
* Fix SSH direction field being unset. Addresses BIT-1365. (Vlad * Fix SSH direction field being unset. Addresses BIT-1365. (Vlad

2
VERSION
View file

@ -1 +1 @@
2.3-836 2.3-838

8
src/Val.cc
View file

@ -2985,8 +2985,10 @@ bool VectorVal::Assign(unsigned int index, Val* element, Opcode op)
} }
} }
Val* val_at_index = 0;
if ( index < val.vector_val->size() ) if ( index < val.vector_val->size() )
Unref((*val.vector_val)[index]); val_at_index = (*val.vector_val)[index];
else else
val.vector_val->resize(index + 1); val.vector_val->resize(index + 1);
@ -2999,10 +3001,12 @@ bool VectorVal::Assign(unsigned int index, Val* element, Opcode op)
StateAccess::Log(new StateAccess(op == OP_INCR ? StateAccess::Log(new StateAccess(op == OP_INCR ?
OP_INCR_IDX : OP_ASSIGN_IDX, OP_INCR_IDX : OP_ASSIGN_IDX,
this, ival, element, (*val.vector_val)[index])); this, ival, element, val_at_index));
Unref(ival); Unref(ival);
} }
Unref(val_at_index);
// Note: we do *not* Ref() the element, if any, at this point. // Note: we do *not* Ref() the element, if any, at this point.
// AssignExpr::Eval() already does this; other callers must remember // AssignExpr::Eval() already does this; other callers must remember
// to do it similarly. // to do it similarly.