mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: cherry-pick fix from chromium issue 1065731 (#24594)
This commit is contained in:
@@ -11,5 +11,7 @@
|
||||
|
||||
"src/electron/patches/webrtc": "src/third_party/webrtc",
|
||||
|
||||
"src/electron/patches/skia": "src/third_party/skia"
|
||||
"src/electron/patches/skia": "src/third_party/skia",
|
||||
|
||||
"src/electron/patches/ffmpeg": "src/third_party/ffmpeg"
|
||||
}
|
||||
|
||||
1
patches/ffmpeg/.patches
Normal file
1
patches/ffmpeg/.patches
Normal file
@@ -0,0 +1 @@
|
||||
backport_1065731.patch
|
||||
30
patches/ffmpeg/backport_1065731.patch
Normal file
30
patches/ffmpeg/backport_1065731.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Cheng Zhao <zcbenz@gmail.com>
|
||||
Date: Thu, 4 Oct 2018 14:57:02 -0700
|
||||
Subject: fix: check return value from avio_read()
|
||||
|
||||
[1065731] [Medium]: audio_decoder_fuzzer: Use-of-uninitialized-value in amr_read_header
|
||||
Backport https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+/5b967f56b6d85f62446836fc8ef64d0dcfcbda17
|
||||
|
||||
diff --git a/libavformat/amr.c b/libavformat/amr.c
|
||||
index eccbbde5b0218e36fd27920850908d88539b9242..b8a5debb167737578f40e3cddc28dbd95871f2b5 100644
|
||||
--- a/libavformat/amr.c
|
||||
+++ b/libavformat/amr.c
|
||||
@@ -89,13 +89,15 @@ static int amr_read_header(AVFormatContext *s)
|
||||
AVStream *st;
|
||||
uint8_t header[9];
|
||||
|
||||
- avio_read(pb, header, 6);
|
||||
+ if (avio_read(pb, header, 6) != 6)
|
||||
+ return AVERROR_INVALIDDATA;
|
||||
|
||||
st = avformat_new_stream(s, NULL);
|
||||
if (!st)
|
||||
return AVERROR(ENOMEM);
|
||||
if (memcmp(header, AMR_header, 6)) {
|
||||
- avio_read(pb, header + 6, 3);
|
||||
+ if (avio_read(pb, header + 6, 3) != 3)
|
||||
+ return AVERROR_INVALIDDATA;
|
||||
if (memcmp(header, AMRWB_header, 9)) {
|
||||
return -1;
|
||||
}
|
||||
Reference in New Issue
Block a user