Skip to content

fix(remote): backport IBatch BLOB continuation kind guard to v4.0 (#9… #9277

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

Open
rafaelmeloreisnovo wants to merge 1 commit into
base: v4.0-release
Choose a base branch
from
+21 −2
Open

fix(remote): backport IBatch BLOB continuation kind guard to v4.0 (#9… #9277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions src/remote/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@
*
*/

/*
* IBatch BLOB-kind invariant (issue #9251):
* NEW : nonzero BLOB ID + no BPB -> use batch default kind flag.
* BPB : nonzero BLOB ID + BPB -> decode the explicit kind from BPB.
* CONT : zero BLOB ID -> preserve the current BLOB kind.
*
* Build diagnostics: keep compiler warnings visible. They help detect unsafe
* conversions and flag handling; suppressing them cannot fix protocol bugs.
* The guard below adds no dependency, allocation or public ABI change.
*/

#include "firebird.h"
#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -2291,6 +2302,15 @@ static Rsr* getStatement(RemoteXdr* xdrs, USHORT statement_id)
return port->port_statement;
}

// One action: apply the default kind only to a new BLOB without an explicit BPB.
// Continuations retain the kind established by the preceding BLOB header.
static inline void applyDefaultBlobKind(Rsr::BatchStream& stream, const ISC_QUAD& blobId,
ULONG bpbSize, ULONG batchFlags) noexcept
{
if (!bpbSize && (blobId.gds_quad_high || blobId.gds_quad_low))
stream.segmented = (batchFlags & (1U << Jrd::DsqlBatch::FLAG_DEFAULT_SEGMENTED)) != 0;
}

static bool_t xdr_blob_stream(RemoteXdr* xdrs, SSHORT statement_id, CSTRING* strmPortion)
{
if (xdrs->x_op == XDR_FREE)
Expand Down Expand Up @@ -2438,8 +2458,7 @@ static bool_t xdr_blob_stream(RemoteXdr* xdrs, SSHORT statement_id, CSTRING* str
flow.newBlob(*blobSize, *bpbSize);
localStrm.curBpb.clear();

if (!flow.bpbSize)
localStrm.segmented = statement->rsr_batch_flags & (1 << Jrd::DsqlBatch::FLAG_DEFAULT_SEGMENTED);
applyDefaultBlobKind(localStrm, *batchBlobId, flow.bpbSize, statement->rsr_batch_flags);

continue;
}
Expand Down