more range checking

This commit is contained in:
okan 2014-01-24 22:38:02 +00:00
parent c7e2ee5dd5
commit 6f10349843

11
parse.y
View File

@ -116,21 +116,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;
}
@ -165,7 +165,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;