diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:58:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:58:44 +0200 |
| commit | 513673a84df5c5624686649136262c5aa14aba00 (patch) | |
| tree | 62b14529d40d3480b6acf4e24c917525eea24911 /libavcodec/jpeglsdec.c | |
| parent | 73e150fff735d99193b2ebef902625d6ee4c8209 (diff) | |
| parent | 7ca603f96f93d988e01d161d611f69a4ecaa3f02 (diff) | |
| download | ffmpeg-513673a84df5c5624686649136262c5aa14aba00.tar.gz | |
Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'
* commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02':
jpegls: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.c')
| -rw-r--r-- | libavcodec/jpeglsdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 97fc600721..2ea75f7543 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -349,10 +349,16 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int off = 0, stride = 1, width, shift, ret = 0; zero = av_mallocz(s->picture_ptr->linesize[0]); + if (!zero) + return AVERROR(ENOMEM); last = zero; cur = s->picture_ptr->data[0]; state = av_mallocz(sizeof(JLSState)); + if (!state) { + av_free(zero); + return AVERROR(ENOMEM); + } /* initialize JPEG-LS state from JPEG parameters */ state->near = near; state->bpp = (s->bits < 2) ? 2 : s->bits; |