Fix CVE-2023-7104

This commit is contained in:
wk333 2024-01-02 15:12:24 +08:00
parent 523a6f9f47
commit 00e4da262a
2 changed files with 44 additions and 1 deletions

38
CVE-2023-7104.patch Normal file
View File

@ -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;

View File

@ -88,7 +88,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 79.0
Release: 14
Release: 15
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
@ -193,6 +193,7 @@ Patch650: CVE-2023-4863-1.patch
Patch651: CVE-2023-4863-2.patch
# https://hg.mozilla.org/mozilla-central/raw-rev/c53f5ef77b62b79af86951a7f9130e1896b695d2
Patch652: CVE-2023-5217.patch
Patch653: CVE-2023-7104.patch
@ -382,6 +383,7 @@ tar -xf %{SOURCE3}
%patch650 -p1
%patch651 -p1
%patch652 -p1
%patch653 -p1
%{__rm} -f .mozconfig
@ -831,6 +833,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Tue Jan 02 2024 wangkai <13474090681@163.com> - 79.0-15
- Fix CVE-2023-7104
* Thu Oct 26 2023 yaoxin <yao_xin001@hoperun.com> - 79.0-14
- Fix for libvpx CVE-2023-5217