mirror of https://github.com/mpv-player/mpv
Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
85915a0b58
commit
83d4f16ae5
|
@ -756,6 +756,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
||||||
clear_sub = -1;
|
clear_sub = -1;
|
||||||
s = demuxer->stream;
|
s = demuxer->stream;
|
||||||
|
|
||||||
|
demuxer->priv =
|
||||||
ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t));
|
ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t));
|
||||||
sync = &ogg_d->sync;
|
sync = &ogg_d->sync;
|
||||||
page = &ogg_d->page;
|
page = &ogg_d->page;
|
||||||
|
@ -1076,9 +1077,6 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Finish to setup the demuxer
|
|
||||||
demuxer->priv = ogg_d;
|
|
||||||
|
|
||||||
if(!n_video || (video_id < 0))
|
if(!n_video || (video_id < 0))
|
||||||
demuxer->video->id = -2;
|
demuxer->video->id = -2;
|
||||||
else
|
else
|
||||||
|
@ -1112,7 +1110,6 @@ int demux_ogg_open(demuxer_t* demuxer) {
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
err_out:
|
err_out:
|
||||||
demux_close_ogg(demuxer);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue