Skip to content

Possible fix for #8734 #8735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 14, 2025
Merged

Possible fix for #8734 #8735

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6de939
Possible fix for #8734
aafemt Sep 8, 2025
38da83d
Use explicit pool
aafemt Sep 8, 2025
df1717b
Use HalfStaticArray as demanded
aafemt Sep 9, 2025
f727114
Use begin() instead of getBuffer()
aafemt Sep 10, 2025
70eaf53
Combine conditions as requested
aafemt Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/dsql/DsqlRequests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,15 +595,20 @@ void DsqlDmlRequest::doExecute(thread_db* tdbb, jrd_tra** traHandle,
JRD_receive(tdbb, request, message->msg_number, outMsgLength, outMsg);

// if this is a singleton select that return some data, make sure there's in fact one record

if (singleton && (request->req_flags & req_active) && outMsgLength > 0)
if (singleton && outMsgLength > 0)
{
// No record returned though expected
if (!(request->req_flags & req_active))
{
status_exception::raise(Arg::Gds(isc_stream_eof));
}

// Create a temp message buffer and try one more receive.
// If it succeed then the next record exists.

std::unique_ptr<UCHAR[]> message_buffer(new UCHAR[outMsgLength]);
HalfStaticArray<UCHAR, BUFFER_SMALL> message_buffer(getPool(), outMsgLength);

JRD_receive(tdbb, request, message->msg_number, outMsgLength, message_buffer.get());
JRD_receive(tdbb, request, message->msg_number, outMsgLength, message_buffer.begin());

// Still active request means that second record exists
if ((request->req_flags & req_active))
Expand Down
Loading