[FFmpeg-cvslog] avformat/bit: check that pkt->size is 10 in write_packet
Andreas Cadhalpun
git at videolan.org
Fri Mar 13 17:49:06 CET 2015
ffmpeg | branch: release/1.1 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Thu Feb 26 21:38:50 2015 +0100| [c34ec56ea8f2e7b17e88f49cdc6a66a36702461c] | committer: Michael Niedermayer
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 at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit eeda2c3de8a8484d9e7d1e47ac836bec850b31fc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c34ec56ea8f2e7b17e88f49cdc6a66a36702461c
---
libavformat/bit.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/bit.c b/libavformat/bit.c
index 9f6ea4a..daad7cc 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);
More information about the ffmpeg-cvslog
mailing list