PR23940, check bounds before using

	PR gas/23940
	* macro.c (getstring): Check array bound before accessing.

(cherry picked from commit 10c172ba93dde7cb7c46982ca217e646565bf938)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 321e243a878ca9c1ef9e39c12d042bc95b4ad000..46b58d2a302106ed45ad9adcd541a72165efa735 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2019-08-02  Alan Modra  <amodra@gmail.com>
+
+       Backport from master
+       2019-01-25  Wu Heng  <wu.heng@zte.com.cn>
+       PR gas/23940
+       * macro.c (getstring): Check array bound before accessing.
+
 2019-07-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        Backport from mainline

diff --git a/gas/macro.c b/gas/macro.c
index 68ae04b010b5ee87feabed517e6c871a72e8a7ff..5f41c13cb80fcd80de3ce93fa6076bce88224ad9 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -285,8 +285,8 @@ getstring (size_t idx, sb *in, sb *acc)
        {
          int nest = 0;
          idx++;
-         while ((in->ptr[idx] != '>' || nest)
-                && idx < in->len)
+         while (idx < in->len
+                && (in->ptr[idx] != '>' || nest))
            {
              if (in->ptr[idx] == '!')
                {