Skip to content

Commit

Permalink
chore: cherry-pick fix from chromium issue 1065731
Browse files Browse the repository at this point in the history
  • Loading branch information
zcbenz committed Jul 16, 2020
1 parent bd90898 commit 5b7ece0
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
4 changes: 3 additions & 1 deletion patches/config.json
Expand Up @@ -13,5 +13,7 @@

"src/electron/patches/pdfium": "src/third_party/pdfium",

"src/electron/patches/webrtc": "src/third_party/webrtc"
"src/electron/patches/webrtc": "src/third_party/webrtc",

"src/electron/patches/ffmpeg": "src/third_party/ffmpeg"
}
1 change: 1 addition & 0 deletions patches/ffmpeg/.patches
@@ -0,0 +1 @@
backport_1065731.patch
30 changes: 30 additions & 0 deletions patches/ffmpeg/backport_1065731.patch
@@ -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 42840a50a300ff23d6ddfa56a1410770f0fdbd59..a963eb3ded78671e48d5bc36397c39281f431d21 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -90,13 +90,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;
}

0 comments on commit 5b7ece0

Please sign in to comment.