From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 25 Sep 2008 00:34:04 +0000 (-0700)
Subject: cope with body_size zero in SMB2 receive
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c80cea0bc00a88336fc9bd4bb332a7a399afd5;p=thirdparty%2Fsamba.git

cope with body_size zero in SMB2 receive
---

diff --git a/source4/smb_server/smb2/smb2_server.h b/source4/smb_server/smb2/smb2_server.h
index d45e0861af4..431add4ed91 100644
--- a/source4/smb_server/smb2/smb2_server.h
+++ b/source4/smb_server/smb2/smb2_server.h
@@ -75,7 +75,7 @@ struct smbsrv_request;
 /* useful way of catching field size errors with file and line number */
 #define SMB2SRV_CHECK_BODY_SIZE(req, size, dynamic) do { \
 	size_t is_size = req->in.body_size; \
-	uint16_t field_size = SVAL(req->in.body, 0); \
+	uint16_t field_size; \
 	uint16_t want_size = ((dynamic)?(size)+1:(size)); \
 	if (is_size < (size)) { \
 		DEBUG(0,("%s: buffer too small 0x%x. Expected 0x%x\n", \
@@ -83,6 +83,7 @@ struct smbsrv_request;
 		smb2srv_send_error(req,  NT_STATUS_INVALID_PARAMETER); \
 		return; \
 	}\
+	field_size = SVAL(req->in.body, 0);       \
 	if (field_size != want_size) { \
 		DEBUG(0,("%s: unexpected fixed body size 0x%x. Expected 0x%x\n", \
 			 __location__, (unsigned)field_size, (unsigned)want_size)); \