From 9601baf6ec9d03957f0d31c9429a92ed09d7dd20 Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 3 Feb 2007 18:11:37 +0000
Subject: [PATCH] Fixed internal compiler error on invalid input code.

git-svn-id: svn://svn.cc65.org/cc65/trunk@3768 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/cc65/expr.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 258cd6777..718c84fba 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -1894,7 +1894,7 @@ static void parseadd (ExprDesc* Expr)
     	    	Error ("Invalid operands for binary operator `+'");
     	    }
 
-    	} else {
+       	} else {
 
 	    /* lhs is a constant and rhs is not constant. Load rhs into
 	     * the primary.
@@ -1974,6 +1974,7 @@ static void parseadd (ExprDesc* Expr)
     	    } else {
        	       	/* OOPS */
     	    	Error ("Invalid operands for binary operator `+'");
+                flags = CF_INT;
        	    }
 
     	    /* Result is a rvalue in primary register */
@@ -2014,6 +2015,7 @@ static void parseadd (ExprDesc* Expr)
        	    } else {
        	       	/* OOPS */
     	    	Error ("Invalid operands for binary operator `+'");
+                flags = CF_INT;
     	    }
 
     	    /* Generate code for the add */
@@ -2052,6 +2054,7 @@ static void parseadd (ExprDesc* Expr)
     	    } else {
        	       	/* OOPS */
     	    	Error ("Invalid operands for binary operator `+'");
+                flags = CF_INT;
     	    }
 
     	    /* Generate code for the add */
@@ -2077,12 +2080,12 @@ static void parsesub (ExprDesc* Expr)
  */
 {
     ExprDesc Expr2;
-    unsigned flags;         	/* Operation flags */
-    Type* lhst;	    	    	/* Type of left hand side */
-    Type* rhst;	    	    	/* Type of right hand side */
-    CodeMark Mark1;	   	/* Save position of output queue */
+    unsigned flags;            	/* Operation flags */
+    Type* lhst;	    	       	/* Type of left hand side */
+    Type* rhst;	    	       	/* Type of right hand side */
+    CodeMark Mark1;	       	/* Save position of output queue */
     CodeMark Mark2;    	       	/* Another position in the queue */
-    int rscale;     	    	/* Scale factor for the result */
+    int rscale;     	       	/* Scale factor for the result */
 
 
     /* Skip the MINUS token */
@@ -2090,7 +2093,6 @@ static void parsesub (ExprDesc* Expr)
 
     /* Get the left hand side type, initialize operation flags */
     lhst = Expr->Type;
-    flags = 0;
     rscale = 1;	     	    	/* Scale by 1, that is, don't scale */
 
     /* Remember the output queue position, then bring the value onto the stack */
@@ -2166,6 +2168,7 @@ static void parsesub (ExprDesc* Expr)
     	    } else {
     	    	/* OOPS */
     	    	Error ("Invalid operands for binary operator `-'");
+                flags = CF_INT;
     	    }
 
     	    /* Do the subtraction */
@@ -2216,6 +2219,7 @@ static void parsesub (ExprDesc* Expr)
     	} else {
  	    /* OOPS */
 	    Error ("Invalid operands for binary operator `-'");
+            flags = CF_INT;
  	}
 
  	/* Generate code for the sub (the & is a hack here) */
-- 
2.39.5