| 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) |
| |