diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-04-20 10:43:29 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-04-20 15:15:49 +0200 |
| commit | 441ea6be15f68f46ecee2365a7e7ee7dd6f11ff3 (patch) | |
| tree | 26daeef954df7e06aac2b8be3d39e7cb639a6e50 /src/3rdparty/sqlite/sqlite3.c | |
| parent | a275d38385382b8630dbd7de4df352bd7defb7aa (diff) | |
sqlite: Fix CVE-2020-11655
This was taken from 4a302b42c7bf5e11 in SQLite, ref:
https://www3.sqlite.org/cgi/src/info/4a302b42c7bf5e11
[ChangeLog][QtSQL][sqlite] Fixed CVE-2020-11655
Task-number: QTBUG-83652
Change-Id: I5ead78d9ee63aa0f12f1c1014c79373728569f30
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/3rdparty/sqlite/sqlite3.c')
| -rw-r--r-- | src/3rdparty/sqlite/sqlite3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c index dfe5323a59..054be43d95 100644 --- a/src/3rdparty/sqlite/sqlite3.c +++ b/src/3rdparty/sqlite/sqlite3.c @@ -133226,6 +133226,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){ struct AggInfo_func *pFunc; int nReg = pAggInfo->nFunc + pAggInfo->nColumn; if( nReg==0 ) return; + if( pParse->nErr ) return; #ifdef SQLITE_DEBUG /* Verify that all AggInfo registers are within the range specified by ** AggInfo.mnReg..AggInfo.mxReg */ |