2 files changed, 7 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4f59ea9..da9330f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16  Alberto Garcia  <agarcia@igalia.com>
+
+	PR gas/14082
+	* app.c (do_scrub_chars): Prevent possible out of bounds access to
+	lex[] array.
+
 2012-05-16  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR target/13503
diff --git a/gas/app.c b/gas/app.c
index e5a7687..aafee2a 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -1344,7 +1344,7 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 	      else
 		{
 		  state = 9;
-		  if (!IS_SYMBOL_COMPONENT (ch)) 
+		  if (ch == EOF || !IS_SYMBOL_COMPONENT (ch))
 		    {
 		      if (ch != EOF)
 			UNGET (ch);