diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2020-10-22 21:40:20 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2020-10-26 11:21:33 +0200 |
| commit | 2096400d6e8249e49df049f9600073fb2219c97a (patch) | |
| tree | e033a7b026bce5a93662c937cda1622480f0d0ec /src/corelib | |
| parent | dc44e4a35eaeab3eb6e75b9c33960bc1b7a136a5 (diff) | |
Revert changes in strto(u)ll.c to avoid integer overflows
Found in oss-fuzz issue 26045.
Pick-to: 5.12 5.15
Change-Id: Id9eac1b4f67ad9bbe2d92dd69cd03338a6ced74e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/text/qlocale_tools.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/text/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp index cad2ce7353..80c9665c92 100644 --- a/src/corelib/text/qlocale_tools.cpp +++ b/src/corelib/text/qlocale_tools.cpp @@ -70,8 +70,12 @@ QT_BEGIN_NAMESPACE +QT_WARNING_PUSH + /* "unary minus operator applied to unsigned type, result still unsigned" */ +QT_WARNING_DISABLE_MSVC(4146) #include "../../3rdparty/freebsd/strtoull.c" #include "../../3rdparty/freebsd/strtoll.c" +QT_WARNING_POP QT_CLOCALE_HOLDER |