Compare commits
No commits in common. "79ce3d005bc48e309fc048861ecd5a3588860055" and "f37e5bba778e36ad9f5015da63ea6668c49ae9a2" have entirely different histories.
79ce3d005b
...
f37e5bba77
@ -1,24 +0,0 @@
|
|||||||
From 73915cab4bb5af47c07c9aa5b1436c8f339b6af3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: maminjie <maminjie1@huawei.com>
|
|
||||||
Date: Thu, 3 Dec 2020 01:30:52 +0000
|
|
||||||
Subject: [PATCH] fix MemorySanitizer: use-of-uninitialized-value
|
|
||||||
|
|
||||||
---
|
|
||||||
src/opusfile.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/opusfile.c b/src/opusfile.c
|
|
||||||
index 8b000a2..889cb31 100644
|
|
||||||
--- a/src/opusfile.c
|
|
||||||
+++ b/src/opusfile.c
|
|
||||||
@@ -479,6 +479,7 @@ static int op_fetch_headers_impl(OggOpusFile *_of,OpusHead *_head,
|
|
||||||
int *_cserialnos,ogg_page *_og){
|
|
||||||
ogg_packet op;
|
|
||||||
int ret;
|
|
||||||
+ memset(&op,0,sizeof(ogg_packet));
|
|
||||||
if(_serialnos!=NULL)*_nserialnos=0;
|
|
||||||
/*Extract the serialnos of all BOS pages plus the first set of Opus headers
|
|
||||||
we see in the link.*/
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ralph Giles <giles@thaumas.net>
|
|
||||||
Date: Tue, 6 Sep 2022 19:04:31 -0700
|
|
||||||
Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer.
|
|
||||||
|
|
||||||
Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns
|
|
||||||
a null pointer. This allows more graceful recovery by the caller
|
|
||||||
in the unlikely event of a fallible ogg_malloc call.
|
|
||||||
|
|
||||||
We do check the return value elsewhere in the code, so the new
|
|
||||||
checks make the code more consistent.
|
|
||||||
|
|
||||||
Thanks to https://github.com/xiph/opusfile/issues/36 for reporting.
|
|
||||||
|
|
||||||
Signed-off-by: Timothy B. Terriberry <tterribe@xiph.org>
|
|
||||||
Signed-off-by: Mark Harris <mark.hsj@gmail.com>
|
|
||||||
---
|
|
||||||
src/opusfile.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/opusfile.c b/src/opusfile.c
|
|
||||||
index ca219b2..3c3c81e 100644
|
|
||||||
--- a/src/opusfile.c
|
|
||||||
+++ b/src/opusfile.c
|
|
||||||
@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){
|
|
||||||
int nbytes;
|
|
||||||
OP_ASSERT(_nbytes>0);
|
|
||||||
buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes);
|
|
||||||
+ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT;
|
|
||||||
nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes);
|
|
||||||
OP_ASSERT(nbytes<=_nbytes);
|
|
||||||
if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes);
|
|
||||||
@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of,
|
|
||||||
if(_initial_bytes>0){
|
|
||||||
char *buffer;
|
|
||||||
buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes);
|
|
||||||
+ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT;
|
|
||||||
memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer));
|
|
||||||
ogg_sync_wrote(&_of->oy,(long)_initial_bytes);
|
|
||||||
}
|
|
||||||
BIN
opusfile-0.11.tar.gz
Normal file
BIN
opusfile-0.11.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,14 +1,12 @@
|
|||||||
Name: opusfile
|
Name: opusfile
|
||||||
Version: 0.12
|
Version: 0.11
|
||||||
Release: 2
|
Release: 2
|
||||||
Summary: A high-level API provides seeking, decode, and playback of Opus streams
|
Summary: A high-level API provides seeking, decode, and playback of Opus streams
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.opus-codec.org/
|
URL: http://www.opus-codec.org/
|
||||||
Source0: http://downloads.xiph.org/releases/opus/%{name}-%{version}.tar.gz
|
Source0: http://downloads.xiph.org/releases/opus/%{name}-%{version}.tar.gz
|
||||||
Patch0000: 0001-fix-MemorySanitizer-use-of-uninitialized-value.patch
|
|
||||||
Patch0001: CVE-2022-47021.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc libogg-devel openssl-devel opus-devel chrpath
|
BuildRequires: libogg-devel openssl-devel opus-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The opusfile library provides seeking, decode, and playback of Opus streams in the Ogg
|
The opusfile library provides seeking, decode, and playback of Opus streams in the Ogg
|
||||||
@ -33,7 +31,6 @@ Development package for opusfile package.
|
|||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
%delete_la
|
%delete_la
|
||||||
chrpath -d %{buildroot}/%{_libdir}/libopus*
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
@ -52,21 +49,6 @@ chrpath -d %{buildroot}/%{_libdir}/libopus*
|
|||||||
%{_libdir}/{libopusfile.so,libopusurl.so}
|
%{_libdir}/{libopusfile.so,libopusurl.so}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Aug 16 2024 wangkai <13474090681@163.com> - 0.12-2
|
|
||||||
- Remove rpath
|
|
||||||
|
|
||||||
* Wed Oct 18 2023 wangkai <13474090681@163.com> - 0.12-1
|
|
||||||
- Update to 0.12
|
|
||||||
|
|
||||||
* Sun Jan 29 2023 yaoxin <yaoxin30@h-partners.com> - 0.11-5
|
|
||||||
- Fix CVE-2022-47021
|
|
||||||
|
|
||||||
* Wed Jun 02 2021 zhaoyao<zhaoyao32@huawei.com> - 0.11-4
|
|
||||||
- fixs faileds: /bin/sh: gcc: command not found.
|
|
||||||
|
|
||||||
* Thu Dec 03 2020 maminjie <maminjie1@huawei.com> - 0.11-3
|
|
||||||
- fix MemorySanitizer: use-of-uninitialized-value
|
|
||||||
|
|
||||||
* Sat Nov 30 2019 daiqianwen <daiqianwen@huawei.com> - 0.11-2
|
* Sat Nov 30 2019 daiqianwen <daiqianwen@huawei.com> - 0.11-2
|
||||||
- Package init
|
- Package init
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: github
|
version_control: github
|
||||||
src_repo: xiph/opusfile
|
src_repo: xiph/opusfile
|
||||||
tag_prefix: ^v
|
tag_prefix: ^v
|
||||||
separator: .
|
seperator: .
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user