Bug#16997513 MY_STRTOLL10 ACCEPTING OVERFLOWED UNSIGNED LONG LONG VALUES AS NORMAL ONES

Joao Gramacho · Joao Gramacho · commit 766ff57eb536 · 2013-07-31T18:15:34.000+01:00
Merge from mysql-5.5 into mysql-5.6
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
@@ -193,8 +193,8 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error)
     goto overflow;
 
   /* Check that we didn't get an overflow with the last digit */
-  if (i > cutoff || (i == cutoff && ((j > cutoff2 || j == cutoff2) &&
-                                     k > cutoff3)))
+  if (i > cutoff || (i == cutoff && (j > cutoff2 || (j == cutoff2 &&
+                                     k > cutoff3))))
     goto overflow;
   li=i*LFACTOR2+ (ulonglong) j*100 + k;
   return (longlong) li;
diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt
@@ -244,6 +244,7 @@ SET(TESTS
   sql_plist
   sql_string
   stdcxx
+  strtoll
   thread_utils
   )
 
diff --git a/unittest/gunit/strtoll-t.cc b/unittest/gunit/strtoll-t.cc
@@ -0,0 +1,47 @@
+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+// First include (the generated) my_config.h, to get correct platform defines.
+#include "my_config.h"
+#include <gtest/gtest.h>
+/*
+
+  ==== Purpose ====
+
+  Test if my_strtoll10 overflows values above unsigned long long
+  limit correctly.
+
+  ==== Related Bugs and Worklogs ====
+
+  BUG#16997513: MY_STRTOLL10 ACCEPTING OVERFLOWED UNSIGNED LONG LONG
+                VALUES AS NORMAL ONES
+
+  ==== Implementation ====
+
+  Check if my_strtoll10 returns the larger unsigned long long and raise
+  the overflow error when receiving a number like 18446744073709551915
+
+*/
+#include <m_string.h>
+
+TEST(StringToULLTest, OverflowedNumber)
+{
+  unsigned long long number;
+  int error;
+  const char * str= "18446744073709551915";
+  number= my_strtoll10(str, 0, &error);
+  EXPECT_EQ(number, ULONGLONG_MAX);
+  EXPECT_EQ(error, MY_ERRNO_ERANGE);
+}

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ SET(TESTS`
`244`	`244`	`sql_plist`
`245`	`245`	`sql_string`
`246`	`246`	`stdcxx`
	`247`	`+ strtoll`
`247`	`248`	`thread_utils`
`248`	`249`	`)`
`249`	`250`