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

Merge remote-tracking branch 'origin/topic/vern/ZAM-tbl-iteration-memory-mgt-fix'

Browse source 
* origin/topic/vern/ZAM-tbl-iteration-memory-mgt-fix:
  fix for memory management associated with ZAM table iteration

(cherry picked from commit 805e9db588)
This commit is contained in:
Tim Wojtulewicz 2024-12-13 08:04:17 -07:00
parent f54416eae4
commit e7f694bcbb
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.0.4-5 | 2024-12-13 12:25:43 -0700
* fix for memory management associated with ZAM table iteration (Vern Paxson, Corelight)
(cherry picked from commit 805e9db58840671c866c85461ad88198eeeec967)
7.0.4-4 | 2024-12-12 13:12:30 -0700 7.0.4-4 | 2024-12-12 13:12:30 -0700
* Fix ZAM's implementation of Analyzer::name() BiF (Christian Kreibich, Corelight) * Fix ZAM's implementation of Analyzer::name() BiF (Christian Kreibich, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.4-4 7.0.4-5

15
src/script_opt/ZAM/ZBody.cc
View file

@ -332,8 +332,9 @@ std::shared_ptr<ProfVec> ZBody::BuildProfVec() const {
class ZBodyStateManager { class ZBodyStateManager {
public: public:
// If fixed_frame is nil then creates a dynamic frame. // If fixed_frame is nil then creates a dynamic frame.
ZBodyStateManager(ZVal* _fixed_frame, int frame_size, const std::vector<int>& _managed_slots) ZBodyStateManager(ZVal* _fixed_frame, int frame_size, const std::vector<int>& _managed_slots,
: fixed_frame(_fixed_frame), managed_slots(_managed_slots) { TableIterVec* _tiv_ptr)
: fixed_frame(_fixed_frame), managed_slots(_managed_slots), tiv_ptr(_tiv_ptr) {
if ( fixed_frame ) if ( fixed_frame )
frame = fixed_frame; frame = fixed_frame;
else { else {
@ -343,7 +344,13 @@ public:
} }
} }
void SetTableIters(TableIterVec* _tiv_ptr) { tiv_ptr = _tiv_ptr; }
~ZBodyStateManager() { ~ZBodyStateManager() {
if ( tiv_ptr )
for ( auto& ti : *tiv_ptr )
ti.Clear();
if ( fixed_frame ) { if ( fixed_frame ) {
// Recover memory and reset for use in next call. // Recover memory and reset for use in next call.
for ( auto s : managed_slots ) { for ( auto s : managed_slots ) {
@ -366,6 +373,7 @@ private:
ZVal* fixed_frame; ZVal* fixed_frame;
ZVal* frame; ZVal* frame;
const std::vector<int>& managed_slots; const std::vector<int>& managed_slots;
TableIterVec* tiv_ptr;
}; };
ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) { ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
@ -400,7 +408,7 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
} }
#endif #endif
ZBodyStateManager state_mgr(fixed_frame, frame_size, managed_slots); ZBodyStateManager state_mgr(fixed_frame, frame_size, managed_slots, &table_iters);
std::unique_ptr<TableIterVec> local_table_iters; std::unique_ptr<TableIterVec> local_table_iters;
std::vector<StepIterInfo> step_iters(num_step_iters); std::vector<StepIterInfo> step_iters(num_step_iters);
@ -415,6 +423,7 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
local_table_iters = std::make_unique<TableIterVec>(table_iters.size()); local_table_iters = std::make_unique<TableIterVec>(table_iters.size());
*local_table_iters = table_iters; *local_table_iters = table_iters;
tiv_ptr = &(*local_table_iters); tiv_ptr = &(*local_table_iters);
state_mgr.SetTableIters(nullptr); // unique_ptr will clean it up directly
} }
} }