From eb45c37be7e32a20612b23f54a830ea0c4db7119 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 5 Feb 2020 14:52:28 +0100 Subject: sqlite: Update to v3.31.1 Since the patches applied previously are no longer required, we have removed those too. [ChangeLog][QtSQL][sqlite] Updated to v3.31.1 Change-Id: Ia80c31683a8cf92cfd114b6da32460ddcf38d502 Reviewed-by: Volker Hilsheimer --- .../0004-Fix-CVE-2019-19646-in-SQLite.patch | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch (limited to 'src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch') diff --git a/src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch b/src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch deleted file mode 100644 index db436ab4f6..0000000000 --- a/src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a83bbce4d6f31d93ea4d2a681aa52c148f148e26 Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Thu, 2 Jan 2020 09:07:08 +0100 -Subject: [PATCH] Fix CVE-2019-19646 in SQLite - -Task-number: QTBUG-81020 -Change-Id: I7176db20d4a44b1fb443a6108675f719e9643343 ---- - src/3rdparty/sqlite/sqlite3.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c -index 57e61b8313..980a149b1a 100644 ---- a/src/3rdparty/sqlite/sqlite3.c -+++ b/src/3rdparty/sqlite/sqlite3.c -@@ -123765,7 +123765,9 @@ SQLITE_PRIVATE void sqlite3Pragma( - if( j==pTab->iPKey ) continue; - if( pTab->aCol[j].notNull==0 ) continue; - sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3); -- sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG); -+ if( sqlite3VdbeGetOp(v,-1)->opcode==OP_Column ){ -+ sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG); -+ } - jmp2 = sqlite3VdbeAddOp1(v, OP_NotNull, 3); VdbeCoverage(v); - zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName, - pTab->aCol[j].zName); --- -2.21.0 (Apple Git-122.2) - -- cgit v1.2.3