packages/firefox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CVE-2023-7104

Browse Source
This commit is contained in:
wk333 2024-01-02 11:23:49 +08:00
parent a98123839d
commit 4f04f02aa8
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;

7
firefox.spec
View File

@ -45,7 +45,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 115.5.0 Version: 115.5.0
Release: 2 Release: 3
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
@ -81,6 +81,7 @@ Patch02: firefox-gcc-build.patch
# -- Upstreamed patches -- # -- Upstreamed patches --
Patch51: mozilla-bmo1170092.patch Patch51: mozilla-bmo1170092.patch
Patch52: CVE-2023-7104.patch
# -- Submitted upstream, not merged -- # -- Submitted upstream, not merged --
Patch101: mozilla-bmo1636168-fscreen.patch Patch101: mozilla-bmo1636168-fscreen.patch
@ -390,6 +391,7 @@ rm -vf ./*/layout/inspector/tests/chrome/test_fontVariationsAPI.css
# -- Upstreamed patches -- # -- Upstreamed patches --
%patch -P51 -p1 -b .mozilla-bmo1170092 %patch -P51 -p1 -b .mozilla-bmo1170092
%patch -P52 -p1
# -- Submitted upstream, not merged -- # -- Submitted upstream, not merged --
%patch -P101 -p1 -b .mozilla-bmo1636168-fscreen %patch -P101 -p1 -b .mozilla-bmo1636168-fscreen
@ -945,6 +947,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Tue Jan 02 2024 wangkai <13474090681@163.com> - 115.5.0-3
- Fix CVE-2023-7104
* Sat Nov 25 2023 Jingwiw <wangjingwei@iscas.ac.cn> - 115.5.0-2 * Sat Nov 25 2023 Jingwiw <wangjingwei@iscas.ac.cn> - 115.5.0-2
- Optimize for riscv64 - Optimize for riscv64
- Use system libraries for VP8, VP9, and WebP - Use system libraries for VP8, VP9, and WebP