Merge commit from fork

TreeHunter9 · Artyom Ivanov · dyemanov · commit 05252e557005 · 2026-03-19T13:15:25.000+03:00
Co-authored-by: Artyom Ivanov &lt;artyom.ivanov@red-soft.ru&gt;
diff --git a/src/common/xdr.cpp b/src/common/xdr.cpp
@@ -218,6 +218,8 @@ bool_t xdr_datum( XDR* xdrs, const dsc* desc, UCHAR* buffer)
 			}
 			if (!xdr_short(xdrs, reinterpret_cast<SSHORT*>(&n)))
 				return FALSE;
+			n = MIN(n, desc->dsc_length - 1);
+
 			if (!xdr_opaque(xdrs, reinterpret_cast<SCHAR*>(p), n))
 				return FALSE;
 			if (xdrs->x_op == XDR_DECODE)

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,8 @@ bool_t xdr_datum( XDR* xdrs, const dsc* desc, UCHAR* buffer)`
`218`	`218`	`}`
`219`	`219`	`if (!xdr_short(xdrs, reinterpret_cast<SSHORT*>(&n)))`
`220`	`220`	`return FALSE;`
	`221`	`+ n = MIN(n, desc->dsc_length - 1);`
	`222`	`+`
`221`	`223`	`if (!xdr_opaque(xdrs, reinterpret_cast<SCHAR*>(p), n))`
`222`	`224`	`return FALSE;`
`223`	`225`	`if (xdrs->x_op == XDR_DECODE)`