diff options
| author | Joao Gramacho <joao.gramacho@oracle.com> | 2013-07-31 17:59:06 +0100 |
|---|---|---|
| committer | Joao Gramacho <joao.gramacho@oracle.com> | 2013-07-31 17:59:06 +0100 |
| commit | b79864ae31aeb74f9c0c4fa51addf698c27710c2 (patch) | |
| tree | abbf8f90fb46d407e5ba8929b70ebeddc7217f49 /strings | |
| parent | 8412ac003cebf98740e874fea392f26b0fbad5e1 (diff) | |
| parent | e5a1966bca33a58fb86c557375b93fc04b9c7202 (diff) | |
| download | mariadb-git-b79864ae31aeb74f9c0c4fa51addf698c27710c2.tar.gz | |
Bug#16997513 MY_STRTOLL10 ACCEPTING OVERFLOWED UNSIGNED LONG LONG VALUES AS NORMAL ONES
Merge from mysql-5.1 into mysql-5.5
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/my_strtoll10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c index cde973d9595..ce935077e4a 100644 --- 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; |