From 1c4f407a6db4c4795bbbc354f5cf311762fb8e33 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 14 Aug 2009 11:51:42 +0200 Subject: [PATCH] decoder/flac: don't allocate cuesheet twice (memleak) The function flac_cue_track() first calls FLAC__metadata_object_new(), then overwrites this pointer with FLAC__metadata_get_cuesheet(). This allocate two FLAC__StreamMetadata objects, but the first pointer is lost, and never freed. --- NEWS | 1 + src/decoder/_flac_common.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index d312b6d97..3da38e8d4 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ ver 0.15.2 (2009/??/??) * decoders: - mad: skip ID3 frames when libid3tag is disabled - flac: parse all replaygain tags + - flac: don't allocate cuesheet twice (memleak) * update: free empty path string (memleak) diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c index ae7d039ce..e096750f3 100644 --- a/src/decoder/_flac_common.c +++ b/src/decoder/_flac_common.c @@ -377,13 +377,15 @@ char* flac_cue_track( const char* pathname, const unsigned int tnum) { - FLAC__StreamMetadata* cs = FLAC__metadata_object_new(FLAC__METADATA_TYPE_CUESHEET); + FLAC__bool success; + FLAC__StreamMetadata* cs; - FLAC__metadata_get_cuesheet(pathname, &cs); - - if (cs == NULL) + success = FLAC__metadata_get_cuesheet(pathname, &cs); + if (!success) return NULL; + assert(cs != NULL); + if (cs->data.cue_sheet.num_tracks <= 1) { FLAC__metadata_object_delete(cs);