diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 01:00:08 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 01:00:08 +0100 |
commit | 96340555430727d4bf38b188d70e272bfc7d286e (patch) | |
tree | b0fade390aec78601edf49f4155ebb5a0c445049 /src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch | |
parent | 2c189ac79b2000041bba85b21b667cedf7fffbd1 (diff) | |
parent | 75285b64ada65748f1fee3942a95b46a3f0b9d7e (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I5d80d84d1fd9f52e7c8e4895cc34d4d29043f400
Diffstat (limited to 'src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch')
-rw-r--r-- | src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch b/src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch deleted file mode 100644 index 9906292860..0000000000 --- a/src/3rdparty/sqlite/patches/0001-Fix-CVE-2019-19244-in-SQLite.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 676425e522e08eb0e7dfaacdac79a5de27542322 Mon Sep 17 00:00:00 2001 -From: Andy Shaw <andy.shaw@qt.io> -Date: Wed, 11 Dec 2019 10:51:22 +0100 -Subject: [PATCH 53/53] Fix CVE-2019-19244 in SQLite - -Fixes: QTBUG-80635 -Change-Id: I718349e28ec76ea164dd50f2a985f2074dd6bdbd ---- - src/3rdparty/sqlite/sqlite3.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c -index 8fd740b300..bd647ca1c2 100644 ---- a/src/3rdparty/sqlite/sqlite3.c -+++ b/src/3rdparty/sqlite/sqlite3.c -@@ -131679,6 +131679,7 @@ SQLITE_PRIVATE int sqlite3Select( - */ - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct - && sqlite3ExprListCompare(sSort.pOrderBy, pEList, -1)==0 -+ && p->pWin==0 - ){ - p->selFlags &= ~SF_Distinct; - pGroupBy = p->pGroupBy = sqlite3ExprListDup(db, pEList, 0); --- -2.21.0 (Apple Git-122.2) - |