Commit 513673a8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7ca603f9'

* commit '7ca603f9':
  jpegls: Check memory allocation
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 73e150ff 7ca603f9
...@@ -349,10 +349,16 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, ...@@ -349,10 +349,16 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
int off = 0, stride = 1, width, shift, ret = 0; int off = 0, stride = 1, width, shift, ret = 0;
zero = av_mallocz(s->picture_ptr->linesize[0]); zero = av_mallocz(s->picture_ptr->linesize[0]);
if (!zero)
return AVERROR(ENOMEM);
last = zero; last = zero;
cur = s->picture_ptr->data[0]; cur = s->picture_ptr->data[0];
state = av_mallocz(sizeof(JLSState)); state = av_mallocz(sizeof(JLSState));
if (!state) {
av_free(zero);
return AVERROR(ENOMEM);
}
/* initialize JPEG-LS state from JPEG parameters */ /* initialize JPEG-LS state from JPEG parameters */
state->near = near; state->near = near;
state->bpp = (s->bits < 2) ? 2 : s->bits; state->bpp = (s->bits < 2) ? 2 : s->bits;
......
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