aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-10 16:28:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-11 04:57:46 +0200
commit23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f (patch)
treeb904aabaaec47c51869dbdc7770efe2f4d65f0ca /libavcodec/h264.c
parent28ccda78236babf500330d1fbf0b7c230bdbdeb6 (diff)
downloadffmpeg-23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f.tar.gz
h264dec: Prevent CABAC and CAVLC bitsteram overreading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 118334ad7c..958c859c72 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -174,20 +174,24 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_l
i-= RS;
}
- if(i>=length-1){ //no escaped 0
- *dst_length= length;
- *consumed= length+1; //+1 for the header
- return src;
- }
-
bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
- av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE);
+ si=h->rbsp_buffer_size[bufidx];
+ av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE+MAX_MBPAIR_SIZE);
dst= h->rbsp_buffer[bufidx];
+ if(si != h->rbsp_buffer_size[bufidx])
+ memset(dst + length, 0, FF_INPUT_BUFFER_PADDING_SIZE+MAX_MBPAIR_SIZE);
if (dst == NULL){
return NULL;
}
+ if(i>=length-1){ //no escaped 0
+ *dst_length= length;
+ *consumed= length+1; //+1 for the header
+ memcpy(dst, src, length);
+ return dst;
+ }
+
//printf("decoding esc\n");
memcpy(dst, src, i);
si=di=i;