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

Fix a crash appeared after the bugfix for #8185 (SIGSEGV with WHERE CURRENT OF statement with statement cache turned on). Reproducible with QA test bugs.core_5231 (release build only). This fix is a very simple one, just to avoid the object state being read after its possible removal. The returned usage counter is not used anyway.

Browse Source
This commit is contained in:
Dmitry Yemanov 2025-01-15 16:53:09 +03:00
parent fe178a1404
commit 69690fd44e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dsql/DsqlStatements.cpp
View File

@ -56,17 +56,15 @@ void DsqlStatement::rethrowDdlException(status_exception& ex, bool metadataUpdat
status_exception::raise(newVector); status_exception::raise(newVector);
} }
int DsqlStatement::release() void DsqlStatement::release()
{ {
fb_assert(refCounter.value() > 0); fb_assert(refCounter.value() > 0);
int refCnt = --refCounter;
if (!refCnt) if (!--refCounter)
{ {
if (cacheKey) if (cacheKey)
{ {
dsqlAttachment->dbb_statement_cache->statementGoingInactive(cacheKey); dsqlAttachment->dbb_statement_cache->statementGoingInactive(cacheKey);
refCnt = refCounter;
} }
else else
{ {
@ -74,8 +72,6 @@ int DsqlStatement::release()
dsqlAttachment->deletePool(&getPool()); dsqlAttachment->deletePool(&getPool());
} }
} }
return refCnt;
} }
void DsqlStatement::doRelease() void DsqlStatement::doRelease()

6
src/dsql/DsqlStatements.h
View File

@ -83,12 +83,12 @@ protected:
virtual ~DsqlStatement() = default; virtual ~DsqlStatement() = default;
public: public:
int addRef() void addRef()
{ {
return ++refCounter; ++refCounter;
} }
int release(); void release();
bool isCursorBased() const bool isCursorBased() const
{ {