virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

libavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt().

Browse Source 
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jörn Heusipp 2016-07-17 15:37:12 +02:00 committed by Michael Niedermayer
parent 2b14204339
commit f1eb6ddcb3
1 changed files with 5 additions and 1 deletions

6
libavformat/libopenmpt.c

@ -89,8 +89,11 @@ static int read_header_openmpt(AVFormatContext *s)
add_meta(s, "comment", openmpt_module_get_metadata(openmpt->module, "message")); add_meta(s, "comment", openmpt_module_get_metadata(openmpt->module, "message"));
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st) {
openmpt_module_destroy(openmpt->module);
openmpt->module = NULL;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
avpriv_set_pts_info(st, 64, 1, 1000); avpriv_set_pts_info(st, 64, 1, 1000);
if (st->duration > 0) if (st->duration > 0)
st->duration = llrint(openmpt->duration*AV_TIME_BASE); st->duration = llrint(openmpt->duration*AV_TIME_BASE);
@ -146,6 +149,7 @@ static int read_close_openmpt(AVFormatContext *s)
{ {
OpenMPTContext *openmpt = s->priv_data; OpenMPTContext *openmpt = s->priv_data;
openmpt_module_destroy(openmpt->module); openmpt_module_destroy(openmpt->module);
openmpt->module = NULL;
return 0; return 0;
} }