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

fixed memory leak for recursive ZAM functions that exit via an exception

Browse source
This commit is contained in:
Vern Paxson 2024-09-11 16:18:38 +02:00 • committed by Christian Kreibich
parent c165e05b83
commit 11a7ef42ef
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -314,6 +314,20 @@ std::shared_ptr<ProfVec> ZBody::BuildProfVec() const {
return pv; return pv;
} }
// Helper class for managing dynamic frames to ensure that their memory
// is recovered if a ZBody is exited via an exception.
class ZBodyDynamicFrame {
public:
ZBodyDynamicFrame(int frame_size) { frame = frame_size > 0 ? new ZVal[frame_size] : nullptr; }
~ZBodyDynamicFrame() { delete[] frame; }
auto Frame() { return frame; }
private:
ZVal* frame;
};
ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) { ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
unsigned int pc = 0; unsigned int pc = 0;
@ -349,14 +363,16 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
} }
#endif #endif
ZVal* frame; ZBodyDynamicFrame dynamic_frame(fixed_frame ? 0 : frame_size);
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);
ZVal* frame;
if ( fixed_frame ) if ( fixed_frame )
frame = fixed_frame; frame = fixed_frame;
else { else {
frame = new ZVal[frame_size]; frame = dynamic_frame.Frame();
// Clear slots for which we do explicit memory management. // Clear slots for which we do explicit memory management.
for ( auto s : managed_slots ) for ( auto s : managed_slots )
frame[s].ClearManagedVal(); frame[s].ClearManagedVal();
@ -437,8 +453,6 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow) {
auto& v = frame[ms]; auto& v = frame[ms];
ZVal::DeleteManagedType(v); ZVal::DeleteManagedType(v);
} }
delete[] frame;
} }
#ifdef ENABLE_ZAM_PROFILE #ifdef ENABLE_ZAM_PROFILE