mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 08:30:37 -04:00
db032688df
Convert multimedia/mythtv-frontend to a slave port of multimedia/mythtv which should make future updates much easier. Upstream security patches have been added to address known vulnerabilities in the bundled ffmpeg 3.2. PR: 225652 (initial patches to update to 29.0) [1] Submitted by: <lucylangthorne55@gmail.com> [1] Differential Revision: https://reviews.freebsd.org/D14563
35 lines
1.4 KiB
Text
35 lines
1.4 KiB
Text
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)
|