Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mpegvideo: Check pointer when allocation fail

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/116/merge
Roman Savchenko 10 years ago committed by Michael Niedermayer
parent e85d91da48
commit e5d1152ccc
1 changed files with 5 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavcodec/mpegvideo.c

7
libavcodec/mpegvideo.c
Unescape View File

@ -1045,11 +1045,14 @@ do {\
if (s1->bitstream_buffer) { if (s1->bitstream_buffer) {
if (s1->bitstream_buffer_size + if (s1->bitstream_buffer_size +
FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) FF_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) {
av_fast_malloc(&s->bitstream_buffer, av_fast_malloc(&s->bitstream_buffer,
&s->allocated_bitstream_buffer_size, &s->allocated_bitstream_buffer_size,
s1->allocated_bitstream_buffer_size); s1->allocated_bitstream_buffer_size);
s->bitstream_buffer_size = s1->bitstream_buffer_size; if (!s->bitstream_buffer)
return AVERROR(ENOMEM);
}
s->bitstream_buffer_size = s1->bitstream_buffer_size;
memcpy(s->bitstream_buffer, s1->bitstream_buffer, memcpy(s->bitstream_buffer, s1->bitstream_buffer,
s1->bitstream_buffer_size); s1->bitstream_buffer_size);
memset(s->bitstream_buffer + s->bitstream_buffer_size, 0, memset(s->bitstream_buffer + s->bitstream_buffer_size, 0,

Write Preview
Loading…
Cancel
Save