!106 修复漏洞CVE-2023-7104

From: @Jeremyzz 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

0003-CVE-2021-36690.patch

@@ -1,44 +0,0 @@
-diff -rNu a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c
---- a/ext/expert/sqlite3expert.c	2021-11-25 09:00:19.267831518 +0800
-+++ b/ext/expert/sqlite3expert.c	2021-11-25 09:07:38.551969861 +0800
-@@ -690,11 +690,13 @@
-   rc = idxPrintfPrepareStmt(db, &p1, pzErrmsg, "PRAGMA table_xinfo=%Q", zTab);
-   while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
-     const char *zCol = (const char*)sqlite3_column_text(p1, 1);
-+    const char *zColSeq = 0;
-     nByte += 1 + STRLEN(zCol);
-     rc = sqlite3_table_column_metadata(
--        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
-+        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
-     );
--    nByte += 1 + STRLEN(zCol);
-+    if( zColSeq==0 ) zColSeq = "binary";
-+    nByte += 1 + STRLEN(zColSeq);
-     nCol++;
-     nPk += (sqlite3_column_int(p1, 5)>0);
-   }
-@@ -714,6 +716,7 @@
-   nCol = 0;
-   while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
-     const char *zCol = (const char*)sqlite3_column_text(p1, 1);
-+    const char *zColSeq = 0;
-     int nCopy = STRLEN(zCol) + 1;
-     pNew->aCol[nCol].zName = pCsr;
-     pNew->aCol[nCol].iPk = (sqlite3_column_int(p1, 5)==1 && nPk==1);
-@@ -721,12 +724,13 @@
-     pCsr += nCopy;
- 
-     rc = sqlite3_table_column_metadata(
--        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
-+        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
-     );
-     if( rc==SQLITE_OK ){
--      nCopy = STRLEN(zCol) + 1;
-+      if( zColSeq==0 ) zColSeq = "binary";
-+      nCopy = STRLEN(zColSeq) + 1;
-       pNew->aCol[nCol].zColl = pCsr;
--      memcpy(pCsr, zCol, nCopy);
-+      memcpy(pCsr, zColSeq, nCopy);
-       pCsr += nCopy;
-     }
- 

0004-CVE-2022-35737.patch

@@ -39,9 +39,9 @@ diff --git a/test/rowvalue.test b/test/rowvalue.test
 index 12fee8237..59b44d938 100644
 --- a/test/rowvalue.test
 +++ b/test/rowvalue.test
-@@ -751,4 +751,35 @@ do_execsql_test 30.3 {
- 
- 
+@@ -751,4 +751,35 @@ do_catchsql_test 27.10 {
+   INSERT INTO t0(c0) VALUES(0) ON CONFLICT(c0) DO UPDATE SET c0 = 3;
+ } {1 {ON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint}}
  
 +# 2022-07-15
 +# https://sqlite.org/forum/forumpost/3607259d3c

0005-CVE-2021-20223.patch

@@ -0,0 +1,73 @@
+From 4c5f8ebaf38faa9be7bdacc4fe53e91dc9750a88 Mon Sep 17 00:00:00 2001
+From: wbq_sky <wangbingquan@huawei.com>
+Date: Wed, 31 Aug 2022 10:56:50 +0800
+Subject: [PATCH] Fix CVE-2021-20223 From
+ d1d43efa4fb0f2098c0e2c5bf2e807c58d5ec05b Mon Sep 17 00:00:00 2001 From: dan
+ <dan@noemail.net> Date: Mon, 26 Oct 2020 13:24:36 +0000 Subject: [PATCH]
+ Prevent fts5 tokenizer unicode61 from considering '\0' to be  a token
+ characters, even if other characters of class "Cc" are.
+
+FossilOrigin-Name: b7b7bde9b7a03665e3691c6d51118965f216d2dfb1617f138b9f9e60e418ed2f
+---
+ ext/fts5/fts5_unicode2.c    |  1 +
+ ext/fts5/test/fts5tok1.test | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+)
+
+diff --git a/ext/fts5/fts5_unicode2.c b/ext/fts5/fts5_unicode2.c
+index 161e8d8..843133e 100644
+--- a/ext/fts5/fts5_unicode2.c
++++ b/ext/fts5/fts5_unicode2.c
+@@ -773,4 +773,5 @@ void sqlite3Fts5UnicodeAscii(u8 *aArray, u8 *aAscii){
+     }
+     iTbl++;
+   }
++  aAscii[0] = 0;                  /* 0x00 is never a token character */
+ }
+diff --git a/ext/fts5/test/fts5tok1.test b/ext/fts5/test/fts5tok1.test
+index a336f11..c605ce3 100644
+--- a/ext/fts5/test/fts5tok1.test
++++ b/ext/fts5/test/fts5tok1.test
+@@ -111,5 +111,40 @@ do_catchsql_test 2.1 {
+   SELECT * FROM t4;
+ } {1 {SQL logic error}}
+ 
++#-------------------------------------------------------------------------
++# Embedded 0x00 characters.
++#
++reset_db
++do_execsql_test 3.1.0 {
++  CREATE VIRTUAL TABLE t1 USING fts5(z);
++  CREATE VIRTUAL TABLE tt USING fts5vocab(t1, 'instance');
++  INSERT INTO t1 VALUES('abc' || char(0) || 'def');
++  SELECT * FROM tt;
++} { abc 1 z 0 def 1 z 1 }
++do_execsql_test 3.1.1 {
++  SELECT hex(z) FROM t1;
++} {61626300646566}
++do_execsql_test 3.1.2 {
++  INSERT INTO t1(t1) VALUES('integrity-check');
++} {}
++
++do_execsql_test 3.2.0 {
++  CREATE VIRTUAL TABLE t2 USING fts5(z, 
++      tokenize="unicode61 categories 'L* N* Co Cc'"
++  );
++  CREATE VIRTUAL TABLE tu USING fts5vocab(t2, 'instance');
++
++  INSERT INTO t2 VALUES('abc' || char(0) || 'def');
++  SELECT * FROM tu;
++} { abc 1 z 0 def 1 z 1 }
++
++do_execsql_test 3.2.1 {
++  SELECT hex(z) FROM t1;
++} {61626300646566}
++
++do_execsql_test 3.2.2 {
++  INSERT INTO t1(t1) VALUES('integrity-check');
++} {}
++
+ 
+ finish_test
+-- 
+2.25.1
+

0006-fix-integer-overflow-on-gigabyte-string.patch

@@ -0,0 +1,28 @@
+From d409970d551d4cc9c8fc969cb3f39b0a2334841f Mon Sep 17 00:00:00 2001
+From: zwtmichael <zhuwentao5@huawei.com>
+Date: Tue, 6 Sep 2022 10:47:19 +0800
+Subject: [PATCH] fix integer overflow on gigabyte string
+
+Signed-off-by: zwtmichael <zhuwentao5@huawei.com>
+---
+ src/printf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/printf.c b/src/printf.c
+index ae95702..699bdb5 100644
+--- a/src/printf.c
++++ b/src/printf.c
+@@ -798,8 +798,8 @@ void sqlite3_str_vappendf(
+       case etSQLESCAPE:           /* %q: Escape ' characters */
+       case etSQLESCAPE2:          /* %Q: Escape ' and enclose in '...' */
+       case etSQLESCAPE3: {        /* %w: Escape " characters */
+-        int i, j, k, n, isnull;
+-        int needQuote;
++        i64 i, j, k, n;
++        int needQuote, isnull;
+         char ch;
+         char q = ((xtype==etSQLESCAPE3)?'"':'\'');   /* Quote character */
+         char *escarg;
+-- 
+2.25.1
+

0007-CVE-2023-7104.patch

@@ -0,0 +1,45 @@
+it From a756d158b3e55831975feb45b753ba499d2adeda Mon Sep 17 00:00:00 2001
+From: mazhao <mazhao12@huawei.com>
+Date: Wed, 3 Jan 2024 12:00:45 +0800
+Subject: [PATCH] Fix a buffer overread in the sessions extension that could
+ occur when processing a corrupt changeset.
+
+Signed-off-by: mazhao <mazhao12@huawei.com>
+---
+ ext/session/sqlite3session.c | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
+index a892804..72ad427 100644
+--- a/ext/session/sqlite3session.c
++++ b/ext/session/sqlite3session.c
+@@ -3050,15 +3050,19 @@ static int sessionReadRecord(
+         }
+       }
+       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
+-        sqlite3_int64 v = sessionGetI64(aVal);
+-        if( eType==SQLITE_INTEGER ){
+-          sqlite3VdbeMemSetInt64(apOut[i], v);
++        if( (pIn->nData-pIn->iNext)<8 ){
++          rc = SQLITE_CORRUPT_BKPT;
+         }else{
+-          double d;
+-          memcpy(&d, &v, 8);
+-          sqlite3VdbeMemSetDouble(apOut[i], d);
++          sqlite3_int64 v = sessionGetI64(aVal);
++          if( eType==SQLITE_INTEGER ){
++            sqlite3VdbeMemSetInt64(apOut[i], v);
++          }else{
++            double d;
++            memcpy(&d, &v, 8);
++            sqlite3VdbeMemSetDouble(apOut[i], d);
++          }
++          pIn->iNext += 8;
+         }
+-        pIn->iNext += 8;
+       }
+     }
+   }
+-- 
+2.34.1
+

CVE-2021-20227.patch

@@ -0,0 +1,69 @@
+Index: sqlite-src-3320300/src/select.c
+==================================================================
+--- sqlite-src-3320300/src/select.c
++++ sqlite-src-3320300/src/select.c
+@@ -5613,11 +5613,13 @@
+ ** within the HAVING expression with a constant "1".
+ */
+ static int havingToWhereExprCb(Walker *pWalker, Expr *pExpr){
+   if( pExpr->op!=TK_AND ){
+     Select *pS = pWalker->u.pSelect;
+-    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) ){
++    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) 
++     && ExprAlwaysFalse(pExpr)==0
++    ){
+       sqlite3 *db = pWalker->pParse->db;
+       Expr *pNew = sqlite3Expr(db, TK_INTEGER, "1");
+       if( pNew ){
+         Expr *pWhere = pS->pWhere;
+         SWAP(Expr, *pNew, *pExpr);
+
+Index: sqlite-src-3320300/test/having.test
+==================================================================
+--- sqlite-src-3320300/test/having.test
++++ sqlite-src-3320300/test/having.test
+@@ -63,12 +63,12 @@
+     "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a HAVING sum(b)>5"
+ 
+   3 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING a=2"
+     "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a COLLATE binary"
+ 
+-  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 0"
+-    "SELECT a, sum(b) FROM t1 WHERE 0 GROUP BY a COLLATE binary"
++  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 1"
++    "SELECT a, sum(b) FROM t1 WHERE 1 GROUP BY a COLLATE binary"
+ 
+   6 "SELECT count(*) FROM t1,t2 WHERE a=c GROUP BY b, d HAVING b=d"
+     "SELECT count(*) FROM t1,t2 WHERE a=c AND b=d GROUP BY b, d"
+ 
+   7 {
+@@ -151,8 +151,28 @@
+ #
+ set ::nondeter_ret 0
+ do_execsql_test 4.3 {
+   SELECT a, sum(b) FROM t3 WHERE nondeter(a) GROUP BY a
+ } {1 4 2 2}
++
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test 5.0 {
++  CREATE TABLE t1(a, b);
++  CREATE TABLE t2(x, y);
++  INSERT INTO t1 VALUES('a', 'b');
++}
++
++# The WHERE clause (a=2), uses an aggregate column from the outer query.
++# If the HAVING term (0) is moved into the WHERE clause in this case,
++# SQLite would at one point optimize (a=2 AND 0) to simply (0). Which
++# is logically correct, but happened to cause problems in aggregate
++# processing for the outer query. This test case verifies that those 
++# problems are no longer present.
++do_execsql_test 5.1 {
++  SELECT min(b), (
++    SELECT x FROM t2 WHERE a=2 GROUP BY y HAVING 0
++  ) FROM t1;
++} {b {}}
+ 
+ 
+ finish_test
+

sqlite.spec

@@ -1,24 +1,28 @@
 %bcond_without check
 
-%global extver 3360000
+%global extver 3320300
 %global tcl_version 8.6
 %global tcl_sitearch %{_libdir}/tcl%{tcl_version}
+%global year 2020
 
 Name:    sqlite
-Version: 3.36.0
-Release: 3
+Version: 3.32.3
+Release: 7
 Summary: Embeded SQL database
 License: Public Domain
 URL:     http://www.sqlite.org/
 
-Source0: https://www.sqlite.org/2021/sqlite-src-%{extver}.zip
-Source1: http://www.sqlite.org/2021/sqlite-doc-%{extver}.zip
-Source2: https://www.sqlite.org/2021/sqlite-autoconf-%{extver}.tar.gz
+Source0: https://www.sqlite.org/%{year}/sqlite-src-%{extver}.zip
+Source1: http://www.sqlite.org/%{year}/sqlite-doc-%{extver}.zip
+Source2: https://www.sqlite.org/%{year}/sqlite-autoconf-%{extver}.tar.gz
 
 Patch1: 0001-sqlite-no-malloc-usable-size.patch
 Patch2: 0002-remove-fail-testcase-in-no-free-fd-situation.patch
-Patch3: 0003-CVE-2021-36690.patch
+Patch3: CVE-2021-20227.patch
 Patch4: 0004-CVE-2022-35737.patch
+Patch5: 0005-CVE-2021-20223.patch
+Patch6: 0006-fix-integer-overflow-on-gigabyte-string.patch
+Patch7: 0007-CVE-2023-7104.patch
 
 BuildRequires: gcc autoconf tcl tcl-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
@@ -65,6 +69,9 @@ This contains man files and HTML files for the using of sqlite.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 rm -f %{name}-doc-%{extver}/sqlite.css~ || :
 
@@ -106,6 +113,8 @@ chmod 755 %{buildroot}/%{tcl_sitearch}/sqlite3/*.so
 %check
 export LD_LIBRARY_PATH=`pwd`/.libs
 export MALLOC_CHECK_=3
+#bypass zipfile.test
+rm test/zipfile.test
 
 %ifarch x86_64 %{ix86}
 %else
@@ -135,67 +144,70 @@ make test
 %{_mandir}/man*/*
 
 %changelog
-* Tue Aug 16 2022 liusirui <liusirui@huawei.com> - 3.36.0-3
-- fix the CVE-2022-35737.
+* Wed Jan 3 2024 mazhao <mazhao12@huawei.com> - 3.32.3-7
+- fix the CVE-2023-7104
 
-* Sat Nov 27 2021 wbq_sky <wangbingquan@huawei.com> - 3.36.0-2
-- fix the CVE-2021-36690.
+* Tue Sep 6 2022 zhuwentao <zhuwentao5@huawei.com> - 3.32.3-6
+- fix integer overflow on gigabyte string
 
-* Fri Nov 25 2021 wbq_sky <wangbingquan@huawei.com> - 3.36.0-1
-- update to 3.36.0.
+* Wed Aug 31 2022 wbq_sky<wangbingquan@huawei.com> - 3.32.3-5
+- Fix CVE-2021-20223
 
-* Fri Sep 26 2021 wbq_sky <wangbingquan@huawei.com> - 3.34.0-4
-- fix the uninitialized value used in pattern match.
+* Tue Aug 16 2022 liusirui<liusirui@huawei.com> - 3.32.3-4
+- Fix CVE-2022-35737
 
-* Fri Sep 3 2021 wbq_sky <wangbingquan@huawei.com> - 3.34.0-3
-- fix the null reference in the tigger statement.
+* Mon Apr 26 2021 bzhaoop<bzhaojyathousandy@gmail.com> - 3.32.3-3
+- Fix CVE-2021-20227
 
-* Fri Sep 3 2021 wbq_sky <wangbingquan@huawei.com> - 3.34.0-2
-- fix the infinite loop problem in the trim function while the pattern is well formed.
-
-* Thu Jan 14 2021 yanglongkang <yanglongkang@huawei.com> - 3.34.0-1
-- update package to 3.34.0
-
-* Thu Sep 3 2020 lihaotian<lihaotian9@huawei.com> - 3.32.3-3
+* Thu Sep 3 2020 lihaotian<lihaotian9@huawei.com> - 3.32.3-2
 - update source0 url
 
-* Tue Jul 21 2020 jixinjie <jixinjie@huawei.com> - 3.32.3-2
-- update yaml file
-
-* Tue Jul 21 2020 jixinjie <jixinjie@huawei.com> - 3.32.3-1
+* Tue Aug 25 2020 yanglongkang <yanglongkang@huawei.com> - 3.32.3-1
 - update package to 3.32.3
 
-* Tue Jun 30 2020 volcanodragon <linfeilong@huawei.com> - 3.24.0-12
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:rename patches
-
-* Tue Jun 23 2020 yanglongkang <yanglongkang@huawei.com> - 3.24.0-11
+* Tue Aug 4 2020 yanglongkang <yanglongkang@huawei.com> - 3.31.1-2
 - Type:cves
-- ID:CVE-2020-13434 CVE-2020-13435 CVE-2020-13630 CVE-2020-13632
-- SUG:NA
-- DESC:fix CVE-2020-13434 CVE-2020-13435 CVE-2020-13630 CVE-2020-13632
+- ID:CVE-2020-13871
+- SUG: NA
+- DESC: fix cve
 
-* Sun Apr 19 2020 ethan848 <mingfangsen@huawei.com>
+* Mon Aug 3 2020 yanglongkang <yanglongkang@huawei.com> - 3.31.1-1
+- Type:cves
+- ID:CVE-2020-15358 CVE-2020-13631
+- SUG: NA
+- DESC: fix cve
+
+* Fri Apr 17 2020 luoshijie <luoshijie1@huawei.com> - 3.31.1-0
 - Type:enhancement
 - ID:NA
-- SUG:NA
-- DESC:CVE-2020-11655 fixed
+- SUG:restart
+- DESC:update sqlite to 3.31.1.
 
-* Tue Mar 10 2020 steven <steven_ygui@163.com> - 3.24.0-9
+* Tue Mar 10 2020 guiyao <guiyao@huawei.com> - 3.24.0-11
+- Type:cves
+- ID:CVE-2020-9327
+- SUG: NA
+- DESC: fix cve
+
+* Fri Feb 28 2020 sunshihao <sunshihao@huawei.com> - 3.24.0-10
 - Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:CVE-2018-20505, CVE-2020-9327 fixed
+- ID:
+- SUG: NA
+- DESC: remove suffix information
 
-* Wed Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.24.0-8
+* Wed Feb 26 2020 guiyao <guiyao@huawei.com> - 3.24.0-9
+- Type:cves
+- ID:CVE-2018-20505
+- SUG:NA
+- DESC:fix cves
+
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.24.0-8
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:CVE-2019-19959 fixed
 
-* Wed Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.24.0-7
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.24.0-7
 - Type:enhancement
 - ID:NA
 - SUG:NA

sqlite.yaml

@@ -1,4 +0,0 @@
-version_control: fossil
-src_repo: https://www.sqlite.org/src
-tag_prefix: "version-"
-seperator: "."