diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2020-10-22 21:40:20 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-26 11:41:51 +0000 |
| commit | 27c9d1f2096b809486861af091adf48375729c57 (patch) | |
| tree | d927513282d230d056c0fb182324f148546e871a /src/corelib/text/qlocale_tools.cpp | |
| parent | e655f9ce987e44484c94c20f404ca629d60d7686 (diff) | |
Revert changes in strto(u)ll.c to avoid integer overflows
Found in oss-fuzz issue 26045.
Change-Id: Id9eac1b4f67ad9bbe2d92dd69cd03338a6ced74e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2096400d6e8249e49df049f9600073fb2219c97a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qlocale_tools.cpp')
| -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 6fe08714c7..ad8cc6e47c 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 |