From 59b266b1d74849a61578fd8c94d3012da4c21039 Mon Sep 17 00:00:00 2001
From: Kito Cheng <kito@0xlab.org>
Date: Thu, 17 Apr 2014 09:01:22 +0000
Subject: [PATCH] * gcc.c (used_arg): Prevent out of bound access for
 multilib_options.

From-SVN: r209470
---
 gcc/ChangeLog | 4 ++++
 gcc/gcc.c     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99ef2dc2ab8..68fc4a7bd15 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-17  Kito Cheng  <kito@0xlab.org>
+
+	* gcc.c (used_arg): Prevent out of bound access for multilib_options.
+
 2014-04-17  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/60849
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5cb485acbd3..c8ab7d67484 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -7490,7 +7490,7 @@ used_arg (const char *p, int len)
 	{
 	  const char *r;
 
-	  for (q = multilib_options; *q != '\0'; q++)
+	  for (q = multilib_options; *q != '\0'; *q && q++)
 	    {
 	      while (*q == ' ')
 		q++;