diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-02 01:00:50 +0200 |
| commit | 0d409333d8679c75beeeda2711a9f01b5e708743 (patch) | |
| tree | 0058d7d3e1f9874893aa367a4ee802940c16549d /src/3rdparty | |
| parent | 9b6c20cb719542cfcf3e031afd5b2b0b1cd3833e (diff) | |
| parent | ad6061b265b6a482a6e0e29b20be0c681332abb1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I5d2c3da38df35922b2147c3c0bc55c6c3bae2fe5
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrParser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/yarr/YarrParser.h b/src/3rdparty/masm/yarr/YarrParser.h index f1ffc92189..a18b553ef0 100644 --- a/src/3rdparty/masm/yarr/YarrParser.h +++ b/src/3rdparty/masm/yarr/YarrParser.h @@ -703,7 +703,8 @@ private: ASSERT(!hasError(m_errorCode)); ASSERT(min <= max); - if (min == UINT_MAX) { + const unsigned quantifyLimit = 1 << 24; + if (min > quantifyLimit || (max != quantifyInfinite && max > quantifyLimit)) { m_errorCode = ErrorCode::QuantifierTooLarge; return; } |