[FFmpeg-cvslog] avcodec/pngdec: set return value on av_stereo3d_create_side_data() failure

Peter Ross git at videolan.org
Sat Apr 18 03:54:11 EEST 2020


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Apr 17 22:35:43 2020 +1000| [55d830f69a2ff3ca191d97862200d4cc480d25b7] | committer: Peter Ross

avcodec/pngdec: set return value on av_stereo3d_create_side_data() failure

Signed-off-by: Peter Ross <pross at xvid.org>
Reviewed-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55d830f69a2ff3ca191d97862200d4cc480d25b7
---

 libavcodec/pngdec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 7e2c19bd57..12d4eb0610 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1286,8 +1286,10 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
         case MKTAG('s', 'T', 'E', 'R'): {
             int mode = bytestream2_get_byte(&s->gb);
             AVStereo3D *stereo3d = av_stereo3d_create_side_data(p);
-            if (!stereo3d)
+            if (!stereo3d) {
+                ret = AVERROR(ENOMEM);
                 goto fail;
+            }
 
             if (mode == 0 || mode == 1) {
                 stereo3d->type  = AV_STEREO3D_SIDEBYSIDE;



More information about the ffmpeg-cvslog mailing list