diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 20:39:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 20:40:21 +0100 |
commit | ab161bfa4b3e4298581471a36ed41f84dfde27da (patch) | |
tree | f829a8d6ab212390981450a3ca8447d9e97eaddd | |
parent | 4adf75cade6905f33baeeaca559013467dc7d1ae (diff) | |
download | ffmpeg-ab161bfa4b3e4298581471a36ed41f84dfde27da.tar.gz |
avformat/asfdec: Check the av_get_packet() return value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/asfdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 79a255f475..c7d03f01f3 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -791,12 +791,17 @@ static int asf_read_header(AVFormatContext *s) if (!s->keylen) { if (!ff_guidcmp(&g, &ff_asf_content_encryption)) { unsigned int len; + int ret; AVPacket pkt; av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n"); len= avio_rl32(pb); av_log(s, AV_LOG_DEBUG, "Secret data:\n"); - av_get_packet(pb, &pkt, len); av_hex_dump_log(s, AV_LOG_DEBUG, pkt.data, pkt.size); av_free_packet(&pkt); + + if ((ret = av_get_packet(pb, &pkt, len)) < 0) + return ret; + av_hex_dump_log(s, AV_LOG_DEBUG, pkt.data, pkt.size); + av_free_packet(&pkt); len= avio_rl32(pb); get_tag(s, "ASF_Protection_Type", -1, len, 32); len= avio_rl32(pb); |