On 2012-01-31 11:40:14 -0500, Justin Ruggles wrote: > From: Reimar Döffinger <[email protected]> > > also check for allocation failure > > Signed-off-by: Justin Ruggles <[email protected]> > --- > libavcodec/mjpegdec.c | 10 +++------- > 1 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index d6ed43b..48a872b 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -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) {
ok Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
