summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-06-11 08:12:13 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-06-11 07:49:16 +0000
commitfbc701311c1e429fd8ad2b8c07bbacf19cfa6575 (patch)
treeb11892e9fc7ea37f5e4f37014735b3ae2fd6ce56
parent54a565160883e4123d40f37fa0f0499e1edb8142 (diff)
downloadqtwebengine-chromium-fbc701311c1e429fd8ad2b8c07bbacf19cfa6575.tar.gz
[Backport] Security Bug 1070012 3/5
Do not suppress errors when resolving references in an ORDER BY clause belonging to a compound SELECT within a view or trigger within ALTER TABLE. Fix for ticket [a10a14e9b4ba2]. Reviewed-On: no review url FossilOrigin-Name: 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026 (cherry picked from commit 4db7ab53f9c30e2e22731ace93ab6b18eef6c4ae) Bug: 1070012 Change-Id: Ic501d8c63ac627588e02233f28fc66d3154f8666 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/sqlite/amalgamation/sqlite3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/sqlite/amalgamation/sqlite3.c b/chromium/third_party/sqlite/amalgamation/sqlite3.c
index c875eb74f7f..20e3006f4fd 100644
--- a/chromium/third_party/sqlite/amalgamation/sqlite3.c
+++ b/chromium/third_party/sqlite/amalgamation/sqlite3.c
@@ -97929,7 +97929,7 @@ static int resolveOrderByTermToExprList(
nc.nErr = 0;
db = pParse->db;
savedSuppErr = db->suppressErr;
- db->suppressErr = 1;
+ if( IN_RENAME_OBJECT==0 ) db->suppressErr = 1;
rc = sqlite3ResolveExprNames(&nc, pE);
db->suppressErr = savedSuppErr;
if( rc ) return 0;