diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2011-09-24 18:00:16 +0200 |
|---|---|---|
| committer | Alexander Strasser <eclipse7@gmx.net> | 2011-09-25 17:16:44 +0200 |
| commit | 715f259bf949b06df1b5ed0307606dc258754c99 (patch) | |
| tree | b0fd62aa9d4d5a3baf5c5a7f96e9116471b58cac | |
| parent | 424bcc46b5fb0d662e0fb9ad6319c5b9ef3d770f (diff) | |
| download | ffmpeg-715f259bf949b06df1b5ed0307606dc258754c99.tar.gz | |
h264: ff_h264_decode_extradata: check buffer args
The buffer size and pointer were not checked prior to testing the first
byte of the buffer. These were sometimes checked before calling, but it is
better to add it inside the function as it takes buf and size arguments.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec5a46409a..1924f364b6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -995,6 +995,9 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) { AVCodecContext *avctx = h->s.avctx; + if(!buf || size <= 0) + return -1; + if(buf[0] == 1){ int i, cnt, nalsize; const unsigned char *p = buf; |