[FFmpeg-devel] [PATCH 2/2] avcodec/mpegvideo: Check pointer when allocation fail
Roman Savchenko
gmstima at gmail.com
Thu May 28 17:25:57 CEST 2015
---
libavcodec/mpegvideo.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 11d6729..bd47203 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1044,11 +1044,14 @@ do {\
if (s1->bitstream_buffer) {
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,
&s->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,
s1->bitstream_buffer_size);
memset(s->bitstream_buffer + s->bitstream_buffer_size, 0,
--
1.9.1
More information about the ffmpeg-devel
mailing list