firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:43:03 +01:00
Code Issues

Fixed #7370: Segfault under OOM conditions

Browse Source
This commit is contained in:
AlexPeshkoff 2022-11-02 20:17:19 +03:00
parent 822642045a
commit 39121d8ecb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/JrdStatement.cpp
View File

@ -380,18 +380,17 @@ jrd_req* JrdStatement::getRequest(thread_db* tdbb, USHORT level)
if (level < requests.getCount() && requests[level])
return requests[level];
requests.grow(level + 1);
// Create the request.
MemoryStats* const parentStats = (flags & FLAG_INTERNAL) ?
&dbb->dbb_memory_stats : &attachment->att_memory_stats;
// Create the request.
jrd_req* const request = FB_NEW_POOL(*pool) jrd_req(attachment, this, parentStats);
AutoPtr<jrd_req> request(FB_NEW_POOL(*pool) jrd_req(attachment, this, parentStats));
request->req_id = dbb->generateStatementId(tdbb);
requests.grow(level + 1);
requests[level] = request;
return request;
return request.release();
}
// Check that we have enough rights to access all resources this request touches including
@ -593,7 +592,10 @@ void JrdStatement::release(thread_db* tdbb)
}
for (jrd_req** instance = requests.begin(); instance != requests.end(); ++instance)
EXE_release(tdbb, *instance);
{
if (*instance)
EXE_release(tdbb, *instance);
}
sqlText = NULL;