Merge branch 'mysql-5.6' into mysql-5.7

Chandan Kunal · Chandan Kunal · commit acdee1603d15 · 2019-06-25T13:05:33.000+05:30
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
@@ -1560,7 +1560,7 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
     str++;
     if (str < end)
     {
-      int negative_exp, exponent;
+      longlong negative_exp, exponent;
       if ((negative_exp= (*str == '-')) || *str=='+')
       {
         if (++str == end)
@@ -1570,7 +1570,10 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
            str < end && (ch= (uchar) (*str - '0')) < 10;
            str++)
       {
-        exponent= exponent * 10 + ch;
+        if (exponent <= (LLONG_MAX - ch) / 10)
+         exponent= exponent * 10 + ch;
+        else
+         goto ret_too_big;
       }
       shift+= negative_exp ? -exponent : exponent;
     }

Original file line number	Diff line number	Diff line change
`@@ -1560,7 +1560,7 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),`
`1560`	`1560`	`str++;`
`1561`	`1561`	`if (str < end)`
`1562`	`1562`	`{`
`1563`		`- int negative_exp, exponent;`
	`1563`	`+ longlong negative_exp, exponent;`
`1564`	`1564`	`if ((negative_exp= (str == '-')) \|\| str=='+')`
`1565`	`1565`	`{`
`1566`	`1566`	`if (++str == end)`
`@@ -1570,7 +1570,10 @@ my_strntoull10rnd_8bit(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),`
`1570`	`1570`	`str < end && (ch= (uchar) (*str - '0')) < 10;`
`1571`	`1571`	`str++)`
`1572`	`1572`	`{`
`1573`		`- exponent= exponent * 10 + ch;`
	`1573`	`+ if (exponent <= (LLONG_MAX - ch) / 10)`
	`1574`	`+ exponent= exponent * 10 + ch;`
	`1575`	`+ else`
	`1576`	`+ goto ret_too_big;`
`1574`	`1577`	`}`
`1575`	`1578`	`shift+= negative_exp ? -exponent : exponent;`
`1576`	`1579`	`}`