summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-11-05 17:58:48 +0100
committerLiang Qi <liang.qi@qt.io>2017-11-05 18:02:18 +0100
commita7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch)
treec58ac922346363c265ad6873cefe9ed205d84a1d /src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch
parentcd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff)
parentea0e868c4881944207e9b3a77011e05a505ff3b7 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: src/corelib/global/minimum-linux.S src/network/access/qhttpthreaddelegate.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch')
-rw-r--r--src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch b/src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch
deleted file mode 100644
index 26d022f6c6..0000000000
--- a/src/3rdparty/sqlite/patches/0001-Fix-CVE-2017-10989-in-sqlite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
-index 7f5e75921f..f5c6180a03 100644
---- a/src/3rdparty/sqlite/sqlite3.c
-+++ b/src/3rdparty/sqlite/sqlite3.c
-@@ -165733,6 +165733,10 @@ static int getNodeSize(
- rc = getIntFromStmt(db, zSql, &pRtree->iNodeSize);
- if( rc!=SQLITE_OK ){
- *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
-+ }else if( pRtree->iNodeSize<(512-64) ){
-+ rc = SQLITE_CORRUPT;
-+ *pzErr = sqlite3_mprintf("undersize RTree blobs in \"%q_node\"",
-+ pRtree->zName);
- }
- }
-