diff options
author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch | |
parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch')
-rw-r--r-- | src/3rdparty/sqlite/patches/0004-Fix-CVE-2019-19646-in-SQLite.patch | 29 |
1 files changed, 0 insertions, 29 deletions
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 <andy.shaw@qt.io> -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) - |