]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mvdec: Allocate extradata only once
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 1 Jan 2021 23:36:39 +0000 (00:36 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 9 Mar 2021 20:16:56 +0000 (21:16 +0100)
Fixes: memleak
Fixes: 28686/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5822961932173312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mvdec.c

index f1f73e51f9c1d3dc96a78dafcdf6fa654627e6f4..2aef93a735dd1d0c4fb4d32268e8788a7637be66 100644 (file)
@@ -213,10 +213,12 @@ static int parse_video_var(AVFormatContext *avctx, AVStream *st,
         st->codecpar->width = var_read_int(pb, size);
     } else if (!strcmp(name, "ORIENTATION")) {
         if (var_read_int(pb, size) == 1101) {
-            st->codecpar->extradata      = av_strdup("BottomUp");
-            if (!st->codecpar->extradata)
-                return AVERROR(ENOMEM);
-            st->codecpar->extradata_size = 9;
+            if (!st->codecpar->extradata) {
+                st->codecpar->extradata = av_strdup("BottomUp");
+                if (!st->codecpar->extradata)
+                    return AVERROR(ENOMEM);
+                st->codecpar->extradata_size = 9;
+            }
         }
     } else if (!strcmp(name, "Q_SPATIAL") || !strcmp(name, "Q_TEMPORAL")) {
         var_read_metadata(avctx, name, size);