svn commit: samba r3665 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2004-11-10 20:37:11 +0000 (Wed, 10 Nov 2004)
New Revision: 3665

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3665

Log:
Generalise fix for trans and nttrans multi-fragment requests.
Jeremy

Modified:
   trunk/source/smbd/ipc.c
   trunk/source/smbd/nttrans.c


Changeset:
Modified: trunk/source/smbd/ipc.c
===================================================================
--- trunk/source/smbd/ipc.c	2004-11-10 19:34:59 UTC (rev 3664)
+++ trunk/source/smbd/ipc.c	2004-11-10 20:37:11 UTC (rev 3665)
@@ -502,7 +502,7 @@
 			goto bad_param;
 		
 		if (pcnt) {
-			if (pdisp+pcnt >= tpscnt)
+			if (pdisp+pcnt > tpscnt)
 				goto bad_param;
 			if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
 				goto bad_param;
@@ -518,7 +518,7 @@
 		}
 
 		if (dcnt) {
-			if (ddisp+dcnt >= tdscnt)
+			if (ddisp+dcnt > tdscnt)
 				goto bad_param;
 			if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
 				goto bad_param;

Modified: trunk/source/smbd/nttrans.c
===================================================================
--- trunk/source/smbd/nttrans.c	2004-11-10 19:34:59 UTC (rev 3664)
+++ trunk/source/smbd/nttrans.c	2004-11-10 20:37:11 UTC (rev 3665)
@@ -2826,7 +2826,7 @@
 			}
 
 			if (parameter_count) {
-				if (parameter_displacement + parameter_count >= total_parameter_count)
+				if (parameter_displacement + parameter_count > total_parameter_count)
 					goto bad_param;
 				if ((parameter_displacement + parameter_count < parameter_displacement) ||
 						(parameter_displacement + parameter_count < parameter_count))
@@ -2843,7 +2843,7 @@
 			}
 
 			if (data_count) {
-				if (data_displacement + data_count >= total_data_count)
+				if (data_displacement + data_count > total_data_count)
 					goto bad_param;
 				if ((data_displacement + data_count < data_displacement) ||
 						(data_displacement + data_count < data_count))