From f9c5e19b790c345915ce837e4756a76b76ad1cbc Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Tue, 2 Jan 2024 14:54:42 +0800
Subject: [PATCH] Fix CVE-2023-7104

(cherry picked from commit 55ece835e23ff18578e379461130d3587052f2a4)
---
 CVE-2023-7104.patch | 38 ++++++++++++++++++++++++++++++++++++++
 firefox.spec        |  7 ++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 CVE-2023-7104.patch

diff --git a/CVE-2023-7104.patch b/CVE-2023-7104.patch
new file mode 100644
index 0000000..d26e0b7
--- /dev/null
+++ b/CVE-2023-7104.patch
@@ -0,0 +1,38 @@
+Origin: https://sqlite.org/src/info/0e4e7a05c4204b47
+
+Index: third_party/sqlite3/src/sqlite3.c
+==================================================================
+--- a/third_party/sqlite3/src/sqlite3.c
++++ b/third_party/sqlite3/src/sqlite3.c
+@@ -3234,19 +3234,23 @@
+             pIn->iNext += nByte;
+           }
+         }
+       }
+       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;
+       }
+     }
+   }
+ 
+   return rc;
+
diff --git a/firefox.spec b/firefox.spec
index 7f8a48a..fa87530 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -148,7 +148,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        102.15.0
-Release:        3
+Release:        4
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -243,6 +243,7 @@ Patch427:        CVE-2023-4863-1.patch
 Patch428:        CVE-2023-4863-2.patch
 # https://hg.mozilla.org/mozilla-central/raw-rev/c53f5ef77b62b79af86951a7f9130e1896b695d2
 Patch429:        CVE-2023-5217.patch
+Patch430:        CVE-2023-7104.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -539,6 +540,7 @@ to run Firefox explicitly on X11.
 %patch427 -p1
 %patch428 -p1
 %patch429 -p1
+%patch430 -p1
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1133,6 +1135,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Tue Jan 02 2024 wangkai <13474090681@163.com> - 102.15.0-4
+- Fix CVE-2023-7104
+
 * Thu Oct 26 2023 yaoxin <yao_xin001@hoperun.com> - 102.15.0-3
 - Fix for libvpx CVE-2023-5217
 
-- 
Gitee