From 76afc683c986f5582193ecdd307b80c65224cf9e Mon Sep 17 00:00:00 2001 From: "bogdan.khavronin" Date: Tue, 14 Oct 2025 11:46:55 +0300 Subject: [PATCH] Added verification of finished requests --- src/dsql/DsqlCursor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/dsql/DsqlCursor.cpp b/src/dsql/DsqlCursor.cpp index d44979715ca..5c83259bf0b 100644 --- a/src/dsql/DsqlCursor.cpp +++ b/src/dsql/DsqlCursor.cpp @@ -135,6 +135,14 @@ int DsqlCursor::fetchNext(thread_db* tdbb, UCHAR* buffer) { if (!(m_flags & IStatement::CURSOR_TYPE_SCROLLABLE)) { + if (m_state == EOS) + { + fb_assert(m_eof); + return 1; + } + + fb_assert(!m_eof); + m_eof = !m_dsqlRequest->fetch(tdbb, buffer); if (m_eof)