Commit 38cc5c29 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mov: Do not allocate empty extradata

Fixes Ticket5723
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 9264bb7e
...@@ -2345,12 +2345,14 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -2345,12 +2345,14 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return ret; return ret;
/* Restore back the primary extradata. */ /* Restore back the primary extradata. */
av_free(st->codecpar->extradata); av_freep(&st->codecpar->extradata);
st->codecpar->extradata_size = sc->extradata_size[0]; st->codecpar->extradata_size = sc->extradata_size[0];
st->codecpar->extradata = av_mallocz(sc->extradata_size[0] + AV_INPUT_BUFFER_PADDING_SIZE); if (sc->extradata_size[0]) {
if (!st->codecpar->extradata) st->codecpar->extradata = av_mallocz(sc->extradata_size[0] + AV_INPUT_BUFFER_PADDING_SIZE);
return AVERROR(ENOMEM); if (!st->codecpar->extradata)
memcpy(st->codecpar->extradata, sc->extradata[0], sc->extradata_size[0]); return AVERROR(ENOMEM);
memcpy(st->codecpar->extradata, sc->extradata[0], sc->extradata_size[0]);
}
return 0; return 0;
} }
......
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