Merge commit from fork

Ev3nt · web-flow · commit 902ca61e4d63 · 2026-07-06T10:36:06.000+03:00
diff --git a/src/remote/protocol.cpp b/src/remote/protocol.cpp
@@ -907,7 +907,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 
 			ULONG count = b->p_batch_messages;
 			ULONG size = statement->rsr_batch_size;
-			if (!size)
+			if (!size && statement->rsr_format)
 				statement->rsr_batch_size = size = FB_ALIGN(statement->rsr_format->fmt_length, FB_ALIGNMENT);
 			if (xdrs->x_op == XDR_DECODE)
 			{

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)`
`907`	`907`
`908`	`908`	`ULONG count = b->p_batch_messages;`
`909`	`909`	`ULONG size = statement->rsr_batch_size;`
`910`		`- if (!size)`
	`910`	`+ if (!size && statement->rsr_format)`
`911`	`911`	`statement->rsr_batch_size = size = FB_ALIGN(statement->rsr_format->fmt_length, FB_ALIGNMENT);`
`912`	`912`	`if (xdrs->x_op == XDR_DECODE)`
`913`	`913`	`{`