mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
Close ogg stream upon error when using AV_EF_EXPLODE.
Without this there can be multiple memory leaks for unrecognized
ogg streams.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bce8fc0754
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
490b7a052e
commit
8e50cf4866
@ -685,8 +685,10 @@ static int ogg_read_header(AVFormatContext *s)
|
|||||||
"Headers mismatch for stream %d: "
|
"Headers mismatch for stream %d: "
|
||||||
"expected %d received %d.\n",
|
"expected %d received %d.\n",
|
||||||
i, os->codec->nb_header, os->nb_header);
|
i, os->codec->nb_header, os->nb_header);
|
||||||
if (s->error_recognition & AV_EF_EXPLODE)
|
if (s->error_recognition & AV_EF_EXPLODE) {
|
||||||
|
ogg_read_close(s);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (os->start_granule != OGG_NOGRANULE_VALUE)
|
if (os->start_granule != OGG_NOGRANULE_VALUE)
|
||||||
os->lastpts = s->streams[i]->start_time =
|
os->lastpts = s->streams[i]->start_time =
|
||||||
|
Loading…
Reference in New Issue
Block a user