Changeset View
Changeset View
Standalone View
Standalone View
head/multimedia/mythtv/files/patch-CVE-2016-10191
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
From 32b95471a86ae383c0f76361d954aec511f7043a Mon Sep 17 00:00:00 2001 | |||||
From: Michael Niedermayer <michael@niedermayer.cc> | |||||
Date: Mon, 5 Dec 2016 11:14:51 +0100 | |||||
Subject: [PATCH] avformat/rtmppkt: Check for packet size mismatches | |||||
Fixes out of array access | |||||
Found-by: Paul Cher <paulcher@icloud.com> | |||||
Reviewed-by: Paul Cher <paulcher@icloud.com> | |||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | |||||
(cherry picked from commit 7d57ca4d9a75562fa32e40766211de150f8b3ee7) | |||||
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | |||||
--- | |||||
libavformat/rtmppkt.c | 8 ++++++++ | |||||
1 file changed, 8 insertions(+) | |||||
diff --git libavformat/rtmppkt.c libavformat/rtmppkt.c | |||||
index 0d693c27f7f..cde0da78ce1 100644 | |||||
--- external/FFmpeg/libavformat/rtmppkt.c.orig | |||||
+++ external/FFmpeg/libavformat/rtmppkt.c | |||||
@@ -235,6 +235,14 @@ static int rtmp_packet_read_one_chunk(URLContext *h, RTMPPacket *p, | |||||
if (hdr != RTMP_PS_TWELVEBYTES) | |||||
timestamp += prev_pkt[channel_id].timestamp; | |||||
+ if (prev_pkt[channel_id].read && size != prev_pkt[channel_id].size) { | |||||
+ av_log(NULL, AV_LOG_ERROR, "RTMP packet size mismatch %d != %d\n", | |||||
+ size, | |||||
+ prev_pkt[channel_id].size); | |||||
+ ff_rtmp_packet_destroy(&prev_pkt[channel_id]); | |||||
+ prev_pkt[channel_id].read = 0; | |||||
+ } | |||||
+ | |||||
if (!prev_pkt[channel_id].read) { | |||||
if ((ret = ff_rtmp_packet_create(p, channel_id, type, timestamp, | |||||
size)) < 0) |