wmii

commit db2e58388f510652c229e82d09c646a3023e48ab
parent d6ea850772a93482c30a0e9216d337db392abbaa
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Fri, 26 May 2006 15:41:23 +0200

off-by-one fixes by Chris King (I'm a moron)


Diffstat:
cmd/wm/fs.c
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmd/wm/fs.c b/cmd/wm/fs.c
@@ -1296,7 +1296,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 
 	switch(type) {
 	case FsFctl:
-		if(fcall->count > sizeof(buf) - 1)
+		if(fcall->count >= sizeof(buf))
 			return Enocommand;
 		memcpy(buf, fcall->data, fcall->count);
 		buf[fcall->count] = 0;
@@ -1353,7 +1353,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 		}
 		break;
 	case FsFborder:
-		if(fcall->count > sizeof(buf))
+		if(fcall->count >= sizeof(buf))
 			return Ebadvalue;
 		memcpy(buf, fcall->data, fcall->count);
 		buf[fcall->count] = 0;
@@ -1364,7 +1364,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 		resize_all_clients();
 		break;
 	case FsFtags:
-		if(!fcall->count || (fcall->count > sizeof(buf)))
+		if(!fcall->count || (fcall->count >= sizeof(buf)))
 			return Ebadvalue;
 		memcpy(buf, fcall->data, fcall->count);
 		buf[fcall->count] = 0;
@@ -1443,7 +1443,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 		def.rules[fcall->offset + fcall->count] = 0;
 		break;
 	case FsFgeom:
-		if(fcall->count > sizeof(buf))
+		if(fcall->count >= sizeof(buf))
 			return Ebadvalue;
 		memcpy(buf, fcall->data, fcall->count);
 		buf[fcall->count] = 0;
@@ -1465,7 +1465,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 	case FsFgrabmod:
 		{
 			unsigned long mod;
-			if(fcall->count > sizeof(buf))
+			if(fcall->count >= sizeof(buf))
 				return Ebadvalue;
 			memcpy(buf, fcall->data, fcall->count);
 			buf[fcall->count] = 0;
@@ -1480,7 +1480,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 		}
 		break;
 	case FsFcolw:
-		if(fcall->count > sizeof(buf))
+		if(fcall->count >= sizeof(buf))
 			return Ebadvalue;
 		memcpy(buf, fcall->data, fcall->count);
 		buf[fcall->count] = 0;
@@ -1498,7 +1498,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 		resize_bar();
 		break;
 	case FsFmode:
-		if(fcall->count > sizeof(buf))
+		if(fcall->count >= sizeof(buf))
 			return Ebadvalue;
 		if(dir_type == FsDarea && !i2)
 			return Enofile;
@@ -1516,7 +1516,7 @@ xwrite(IXPConn *c, Fcall *fcall)
 			def.colmode = i;
 		break;
 	case FsFevent:
-		if(fcall->count > sizeof(buf))
+		if(fcall->count >= sizeof(buf))
 			return Ebadvalue;
 		if(fcall->count) {
 			memcpy(buf, fcall->data, fcall->count);