avformat/ffmdec: cleanup on extradata memory allocation failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago · b98510de5c
parent fdf588d7cf
commit b98510de5c
1 changed files with 8 additions and 4 deletions
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@ -379,8 +379,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
                    goto fail;
                }
                codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-                if (!codecpar->extradata)
-                    return AVERROR(ENOMEM);
+                if (!codecpar->extradata) {
+                    ret = AVERROR(ENOMEM);
+                    goto fail;
+                }
                codecpar->extradata_size = size;
                avio_read(pb, codecpar->extradata, size);
            }
@ -690,8 +692,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
                goto fail;
            }
            codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-            if (!codecpar->extradata)
-                return AVERROR(ENOMEM);
+            if (!codecpar->extradata) {
+                ret = AVERROR(ENOMEM);
+                goto fail;
+            }
            codecpar->extradata_size = size;
            avio_read(pb, codecpar->extradata, size);
        }