aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-02-26 21:38:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 02:13:09 +0200
commit77955dcabfce95b32f696d521f260d53b1ac3709 (patch)
tree19623c15504d6b41008e7cf0bdc89cfcc7235b3c
parent15fc5263f9d474cc1107d77246106824df3ddfcc (diff)
downloadffmpeg-77955dcabfce95b32f696d521f260d53b1ac3709.tar.gz
avformat/bit: check that pkt->size is 10 in write_packet
Ohter packet sizes are not supported by this muxer. This avoids a null pointer dereference of pkt->data. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eeda2c3de8a8484d9e7d1e47ac836bec850b31fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/bit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/bit.c b/libavformat/bit.c
index 0be471ac4f..42df0c2fae 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -133,6 +133,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
GetBitContext gb;
int i;
+ if (pkt->size != 10)
+ return AVERROR(EINVAL);
+
avio_wl16(pb, SYNC_WORD);
avio_wl16(pb, 8 * 10);