Accepting request 811904 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/811904 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=29
This commit is contained in:
commit
0881da4f64
@ -1,32 +0,0 @@
|
|||||||
From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Niedermayer <michael@niedermayer.cc>
|
|
||||||
Date: Sat, 7 Mar 2020 15:42:58 +0100
|
|
||||||
Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS
|
|
||||||
|
|
||||||
Fixes: out of array access
|
|
||||||
Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584
|
|
||||||
Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680
|
|
||||||
|
|
||||||
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
|
|
||||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
||||||
---
|
|
||||||
libavcodec/cbs_jpeg.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c
|
|
||||||
index 6bbce5f89b..89512a26bb 100644
|
|
||||||
--- a/libavcodec/cbs_jpeg.c
|
|
||||||
+++ b/libavcodec/cbs_jpeg.c
|
|
||||||
@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx,
|
|
||||||
if (marker == JPEG_MARKER_SOS) {
|
|
||||||
length = AV_RB16(frag->data + start);
|
|
||||||
|
|
||||||
+ if (length > end - start)
|
|
||||||
+ return AVERROR_INVALIDDATA;
|
|
||||||
+
|
|
||||||
data_ref = NULL;
|
|
||||||
data = av_malloc(end - start +
|
|
||||||
AV_INPUT_BUFFER_PADDING_SIZE);
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c
|
|
||||||
size 9094140
|
|
@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1
|
|
||||||
|
|
||||||
iQEcBAABAgAGBQJeC8HeAAoJELQyLwTWdljYP0oH/1VbXJcZAInbKM7Qhuc8ydch
|
|
||||||
7iQZ6tPxcaMupybgVMgMnB4XKA+YNaLCSPclg+bmcGNvkOyWN7TnVl3Qc20mKvcH
|
|
||||||
0sk4jGWjXHQm3rBSdxuQjnXX16u5T/JamUgN+3cP+OJSW8opSmTH5UuYsxox7rsw
|
|
||||||
nSAngU/kyNgHOeDePB0uH+p/bYDywS28D/MOTAWIVYhmvLRZNJ58RhB0j0UiNhxx
|
|
||||||
AlGsQFI1h8nZYKSc1i6jk2BF8wE3YAhraEWCJ3bhGsJcWxZ+YoCMO1TskC8Q7WG/
|
|
||||||
ZmdQw9EQAcUO6xDAHD2fURQI1Tw+Gt0vVs2J0llhh8omK8vlD/N112yD4i4w0YI=
|
|
||||||
=EfDC
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
ffmpeg-4.2.3.tar.xz
Normal file
3
ffmpeg-4.2.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
|
||||||
|
size 9101192
|
11
ffmpeg-4.2.3.tar.xz.asc
Normal file
11
ffmpeg-4.2.3.tar.xz.asc
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1
|
||||||
|
|
||||||
|
iQEcBAABCAAGBQJexrUWAAoJELQyLwTWdljYzyUIAKCrYZuodL55ImESh1AQsoGc
|
||||||
|
Ju/is8LniYbxakom+fQCiEhg/TpVkaOVssawGexeIaJ+idauS+W2NGMsBVLB4dGg
|
||||||
|
YhZJfUmYkapXAU4KTlUO62JDazOGqFgMtyTCtVnvo6mF5hwcJsELykQs1fj1ao38
|
||||||
|
5LEuW7n1rwB57P6y2wJYScKtQVJjsEONv6a2wHdzSxN461SFNzlPPTowAzDR3Dyu
|
||||||
|
KPV0n6OEfAinC5ZyzT/P6r733F/JChKbiMrkJmesR1wt/ZLI2MtItQxJX3ylx8B8
|
||||||
|
Z0UsJLcFgoQVSJbWMneMizjrYeBLRjHtRZwQlKj51vlc6kr9UCD3wh/SMoIoc5A=
|
||||||
|
=OK3T
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 5 16:21:42 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 4.2.3:
|
||||||
|
* Stable bug fix release, mainly codecs and format fixes.
|
||||||
|
- Drop 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch: Fixed
|
||||||
|
upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 28 06:48:37 UTC 2020 - Jiri Slaby <jslaby@suse.com>
|
Thu May 28 06:48:37 UTC 2020 - Jiri Slaby <jslaby@suse.com>
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@
|
|||||||
%define _major_version 4
|
%define _major_version 4
|
||||||
%define _major_expected 5
|
%define _major_expected 5
|
||||||
Name: ffmpeg-4
|
Name: ffmpeg-4
|
||||||
Version: 4.2.2
|
Version: 4.2.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library for working with various multimedia formats
|
Summary: Library for working with various multimedia formats
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -118,7 +118,6 @@ Patch6: ffmpeg-4.2-dlopen-fdk_aac.patch
|
|||||||
Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch
|
Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch
|
||||||
Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
|
Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
|
||||||
Patch9: 929e5159bc13da374b83f5627879c607acce180b.patch
|
Patch9: 929e5159bc13da374b83f5627879c607acce180b.patch
|
||||||
Patch10: 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch
|
|
||||||
BuildRequires: ladspa-devel
|
BuildRequires: ladspa-devel
|
||||||
BuildRequires: libgsm-devel
|
BuildRequires: libgsm-devel
|
||||||
BuildRequires: libmp3lame-devel
|
BuildRequires: libmp3lame-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user