2003-06-28 Miguel de Icaza <miguel@ximian.com>

	* cs-parser.jay (statement_expression): Set the return value to
	null, to avoid a crash when we catch an error.

svn path=/trunk/mcs/; revision=15718

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 580a5a6c527544d94d22d6b41b4e73f2b5af2563..7ec8f4e6106bf78f346cc0026e93899e3aeb8bc5 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-28  Miguel de Icaza  <miguel@ximian.com>
+
+       * cs-parser.jay (statement_expression): Set the return value to
+       null, to avoid a crash when we catch an error.
+
 2003-06-24  Miguel de Icaza  <miguel@ximian.com>
 
        * cs-parser.jay: Applied patch from Jackson that adds support for

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 5ff68dbb48f285019f22e00261558605c7b755df..d2f3de8be641e44b895ce014e4807e227f5da0a1 100755 (executable)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -3012,6 +3012,7 @@ statement_expression
        | pre_decrement_expression      { $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
        | error {
                Report.Error (1002, lexer.Location, "Expecting `;'");
+               $$ = null;
          }
        ;