From 83a4fe0dc71aafbef11477b284abe530d3877556 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 3 Feb 2011 09:44:39 +0000
Subject: libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011

---
 mesalib/src/glsl/glcpp/glcpp-parse.y | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/glsl/glcpp/glcpp-parse.y')

diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y
index aa5a0c4f2..1f6e67fa0 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.y
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.y
@@ -388,7 +388,12 @@ expression:
 		$$ = $1 + $3;
 	}
 |	expression '%' expression {
-		$$ = $1 % $3;
+		if ($3 == 0) {
+			yyerror (& @1, parser,
+				 "zero modulus in preprocessor directive");
+		} else {
+			$$ = $1 % $3;
+		}
 	}
 |	expression '/' expression {
 		if ($3 == 0) {
-- 
cgit v1.2.3