* gcc.c (used_arg): Prevent out of bound access for multilib_options.

From-SVN: r209470

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99ef2dc2ab86f5a5f3ff230d2f3f4ab88fa596bf..68fc4a7bd15609773e296253e3e7a4f73b95fc92 100644 (file)
--- 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 5cb485acbd3470c7161fc6a3393643bfd07053a8..c8ab7d674845341531a8a4f729cc397fdacbc88d 100644 (file)
--- 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++;