Reject packets for non-existing or attachment streams.
---
libavformat/mux.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 5af9b54..06dacea 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -432,10 +432,33 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
+static int check_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ if (!pkt)
+ return 0;
+
+ if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) {
+ av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n",
+ pkt->stream_index);
+ return AVERROR(EINVAL);
+ }
+
+ if (s->streams[pkt->stream_index]->codec->codec_type ==
AVMEDIA_TYPE_ATTACHMENT) {
+ av_log(s, AV_LOG_ERROR, "Received a packet for an attachment
stream.\n");
+ return AVERROR(EINVAL);
+ }
+
+ return 0;
+}
+
int av_write_frame(AVFormatContext *s, AVPacket *pkt)
{
int ret;
+ ret = check_packet(s, pkt);
+ if (ret < 0)
+ return ret;
+
if (!pkt) {
if (s->oformat->flags & AVFMT_ALLOW_FLUSH)
return s->oformat->write_packet(s, pkt);
@@ -563,6 +586,10 @@ int av_interleaved_write_frame(AVFormatContext *s,
AVPacket *pkt)
{
int ret, flush = 0;
+ ret = check_packet(s, pkt);
+ if (ret < 0)
+ return ret;
+
if (pkt) {
AVStream *st = s->streams[pkt->stream_index];
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
