diff mbox series

[FFmpeg-devel,18/54] avformat/libgme: Simplify cleanup after read_header failure

Message ID HE1PR0301MB21542C65A14514A064CFC6E78F309@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Accepted
Commit 87319ed26fee13c4ad45a1cdc0d4866c7a73f320
Headers show
Series [FFmpeg-devel,01/54] avformat: Add internal flags for AV(In|Out)putFormat | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 15, 2021, 11:32 p.m. UTC 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/libgme.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/libgme.c b/libavformat/libgme.c
index 95323002e6..6a145349a7 100644
--- a/libavformat/libgme.c
+++ b/libavformat/libgme.c
@@ -84,7 +84,8 @@  static int load_metadata(AVFormatContext *s, int64_t *duration)
 static int read_close_gme(AVFormatContext *s)
 {
     GMEContext *gme = s->priv_data;
-    gme_delete(gme->music_emu);
+    if (gme->music_emu)
+        gme_delete(gme->music_emu);
     return 0;
 }
 
@@ -121,26 +122,21 @@  static int read_header_gme(AVFormatContext *s)
     }
 
     if (gme_open_data(buf, sz, &gme->music_emu, gme->sample_rate)) {
+        gme->music_emu = NULL; /* Just for safety */
         av_freep(&buf);
         return AVERROR_INVALIDDATA;
     }
     av_freep(&buf);
 
     ret = load_metadata(s, &duration);
-    if (ret < 0) {
-        read_close_gme(s);
+    if (ret < 0)
         return ret;
-    }
-    if (gme_start_track(gme->music_emu, gme->track_index)) {
-        read_close_gme(s);
+    if (gme_start_track(gme->music_emu, gme->track_index))
         return AVERROR_UNKNOWN;
-    }
 
     st = avformat_new_stream(s, NULL);
-    if (!st) {
-        read_close_gme(s);
+    if (!st)
         return AVERROR(ENOMEM);
-    }
     avpriv_set_pts_info(st, 64, 1, 1000);
     if (duration > 0)
         st->duration = duration;
@@ -201,6 +197,7 @@  const AVInputFormat ff_libgme_demuxer = {
     .name           = "libgme",
     .long_name      = NULL_IF_CONFIG_SMALL("Game Music Emu demuxer"),
     .priv_data_size = sizeof(GMEContext),
+    .flags_internal = FF_FMT_INIT_CLEANUP,
     .read_probe     = probe_gme,
     .read_header    = read_header_gme,
     .read_packet    = read_packet_gme,