Commit 0880503f authored by Reimar Döffinger's avatar Reimar Döffinger Committed by Justin Ruggles

mjpegdec: use av_fast_padded_malloc()

also check for allocation failure
Signed-off-by: 's avatarJustin Ruggles <justin.ruggles@gmail.com>
parent 2f4b9021
......@@ -1359,13 +1359,9 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
int start_code;
start_code = find_marker(buf_ptr, buf_end);
if ((buf_end - *buf_ptr) > s->buffer_size) {
av_free(s->buffer);
s->buffer_size = buf_end - *buf_ptr;
s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE);
av_log(s->avctx, AV_LOG_DEBUG,
"buffer too small, expanding to %d bytes\n", s->buffer_size);
}
av_fast_padded_malloc(&s->buffer, &s->buffer_size, buf_end - *buf_ptr);
if (!s->buffer)
return AVERROR(ENOMEM);
/* unescape buffer of SOS, use special treatment for JPEG-LS */
if (start_code == SOS && !s->ls) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment