Merge commit from fork

TreeHunter9 · Artyom Ivanov · dyemanov · commit 39a488a8ab5b · 2026-03-19T13:15:06.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
@@ -213,6 +213,8 @@ bool_t xdr_datum( xdr_t* 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
`@@ -213,6 +213,8 @@ bool_t xdr_datum( xdr_t* xdrs, const dsc* desc, UCHAR* buffer)`
`213`	`213`	`}`
`214`	`214`	`if (!xdr_short(xdrs, reinterpret_cast<SSHORT*>(&n)))`
`215`	`215`	`return FALSE;`
	`216`	`+ n = MIN(n, desc->dsc_length - 1);`
	`217`	`+`
`216`	`218`	`if (!xdr_opaque(xdrs, reinterpret_cast<SCHAR*>(p), n))`
`217`	`219`	`return FALSE;`
`218`	`220`	`if (xdrs->x_op == XDR_DECODE)`