Merge commit from fork

Co-authored-by: aleksey.mochalov <aleksey.mochalov@red-soft.ru>

Author: 2 people

src/burp/canonical.cpp

@@ -421,6 +421,9 @@ static bool_t xdr_slice(BurpXdr* xdrs, lstring* slice, /*USHORT sdl_length,*/ co
 	if (!xdr_long(xdrs, reinterpret_cast<SLONG*>(&slice->lstr_length)))
 		  return FALSE;
 
+	if ((xdrs->x_op != XDR_FREE) && !sdl)
+		return FALSE;
+
 	// Handle operation specific stuff, particularly memory allocation/deallocation
 
 	switch (xdrs->x_op)

src/remote/protocol.cpp

@@ -1759,6 +1759,9 @@ static bool_t xdr_slice(RemoteXdr* xdrs, lstring* slice, /*USHORT sdl_length,*/
 	if (!xdr_long(xdrs, reinterpret_cast<SLONG*>(&slice->lstr_length)))
 		return FALSE;
 
+	if ((xdrs->x_op != XDR_FREE) && !sdl)
+		return FALSE;
+
 	// Handle operation specific stuff, particularly memory allocation/deallocation
 
 	switch (xdrs->x_op)