about summary refs log tree commit diff
path: root/parse.y
diff options
context:
space:
mode:
authorokan <okan>2014-01-24 22:38:02 +0000
committerokan <okan>2014-01-24 22:38:02 +0000
commit5fd119daea8de1e84f382e7651c996fd861974b9 (patch)
treede65598674fad017b2c1ea457480a5c7ab7c6be8 /parse.y
parent371902b3c9fc6c7419f8134e96d67c8735726ff2 (diff)
parent6f103498437d2b2b9eeee66be168a1cc0144bdff (diff)
downloadcwm-5fd119daea8de1e84f382e7651c996fd861974b9.tar.gz
cwm-5fd119daea8de1e84f382e7651c996fd861974b9.tar.xz
cwm-5fd119daea8de1e84f382e7651c996fd861974b9.zip
cvsimport
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y11
1 files changed, 7 insertions, 4 deletions
diff --git a/parse.y b/parse.y
index 188c090..6fbeb8d 100644
--- a/parse.y
+++ b/parse.y
@@ -118,21 +118,21 @@ main		: FONTNAME STRING		{
 				conf->flags |= CONF_STICKY_GROUPS;
 		}
 		| BORDERWIDTH NUMBER {
-			if ($2 < 0) {
+			if ($2 < 0 || $2 > UINT_MAX) {
 				yyerror("invalid borderwidth: %d", $2);
 				YYERROR;
 			}
 			conf->bwidth = $2;
 		}
 		| MOVEAMOUNT NUMBER {
-			if ($2 < 0) {
+			if ($2 < 0 || $2 > INT_MAX) {
 				yyerror("invalid movemount: %d", $2);
 				YYERROR;
 			}
 			conf->mamount = $2;
 		}
 		| SNAPDIST NUMBER {
-			if ($2 < 0) {
+			if ($2 < 0 || $2 > INT_MAX) {
 				yyerror("invalid snapdist: %d", $2);
 				YYERROR;
 			}
@@ -167,7 +167,10 @@ main		: FONTNAME STRING		{
 			free($3);
 		}
 		| GAP NUMBER NUMBER NUMBER NUMBER {
-			if ($2 < 0 || $3 < 0 || $4 < 0 || $5 < 0) {
+			if ($2 < 0 || $2 > INT_MAX ||
+			    $3 < 0 || $3 > INT_MAX ||
+			    $4 < 0 || $4 > INT_MAX ||
+			    $5 < 0 || $5 > INT_MAX) {
 				yyerror("invalid gap: %d %d %d %d",
 				    $2, $3, $4, $5);
 				YYERROR;