Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-18 21:06:17 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 17:14:40 +0400
commit1ec03662c0f225cba9685cf21328f4847be2ee97 (patch)
treefc35ee428b145ea1d3cf6029b2391dfe653f87ec
parent588ae964f4bb26918c76253722ea24e004c24b40 (diff)
avcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f07cebcd910c97ff6012085c21493231752990e9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h263dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index ef1b6ed62c..a28edbd682 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -724,10 +724,10 @@ frame_end:
}
if(startcode_found){
- av_fast_malloc(
+ av_fast_padded_mallocz(
&s->bitstream_buffer,
&s->allocated_bitstream_buffer_size,
- buf_size - current_pos + FF_INPUT_BUFFER_PADDING_SIZE);
+ buf_size - current_pos);
if (!s->bitstream_buffer)
return AVERROR(ENOMEM);
memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);