diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-06-06 07:40:34 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-12-02 18:26:30 +0000 |
| commit | d585cacce57e8e7dfb5e3915bf78ea47a73ad434 (patch) | |
| tree | f0215ae27c9e9e9e73861522f6516c0b4b6fd702 | |
| parent | 91c25e4f4c308e81d67f9bc454bceae897f595ea (diff) | |
| download | qtwebengine-chromium-d585cacce57e8e7dfb5e3915bf78ea47a73ad434.tar.gz | |
[Backport] Fix for security issue 940205
sqlite: Backport bugfix for clusterfuzz security bug
Bug: 940205
Change-Id: If45839bcf60b29db3ee0096a69a05dfcf8c7c9c2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/sqlite/amalgamation/sqlite3.c | 3 | ||||
| -rw-r--r-- | chromium/third_party/sqlite/src/src/build.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromium/third_party/sqlite/amalgamation/sqlite3.c b/chromium/third_party/sqlite/amalgamation/sqlite3.c index 9f03a9c121b..81945efc384 100644 --- a/chromium/third_party/sqlite/amalgamation/sqlite3.c +++ b/chromium/third_party/sqlite/amalgamation/sqlite3.c @@ -107471,7 +107471,8 @@ SQLITE_PRIVATE void sqlite3AddPrimaryKey( && sortOrder!=SQLITE_SO_DESC ){ if( IN_RENAME_OBJECT && pList ){ - sqlite3RenameTokenRemap(pParse, &pTab->iPKey, pList->a[0].pExpr); + Expr *pCExpr = sqlite3ExprSkipCollate(pList->a[0].pExpr); + sqlite3RenameTokenRemap(pParse, &pTab->iPKey, pCExpr); } pTab->iPKey = iCol; pTab->keyConf = (u8)onError; diff --git a/chromium/third_party/sqlite/src/src/build.c b/chromium/third_party/sqlite/src/src/build.c index 806c89f439b..24633eb05dd 100644 --- a/chromium/third_party/sqlite/src/src/build.c +++ b/chromium/third_party/sqlite/src/src/build.c @@ -1400,7 +1400,8 @@ void sqlite3AddPrimaryKey( && sortOrder!=SQLITE_SO_DESC ){ if( IN_RENAME_OBJECT && pList ){ - sqlite3RenameTokenRemap(pParse, &pTab->iPKey, pList->a[0].pExpr); + Expr *pCExpr = sqlite3ExprSkipCollate(pList->a[0].pExpr); + sqlite3RenameTokenRemap(pParse, &pTab->iPKey, pCExpr); } pTab->iPKey = iCol; pTab->keyConf = (u8)onError; |