virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Close ogg stream upon error when using AV_EF_EXPLODE.

Browse Source 
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>
This commit is contained in:
Dale Curtis 2017-11-20 12:07:57 -08:00 committed by Michael Niedermayer
parent 7010dd98b5
commit bce8fc0754
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggdec.c
View File

@ -719,9 +719,11 @@ 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 =
ogg_gptopts(s, i, os->start_granule, NULL); ogg_gptopts(s, i, os->start_granule, NULL);