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.

decoder/flac: don't allocate cuesheet twice (memleak)
1c4f407a · Max Kellermann · e44f3139 · 1c4f407a · 1c4f407a
Commit 1c4f407a authored Aug 14, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

NEWS NEWS +1 -0

_flac_common.c src/decoder/_flac_common.c +6 -4

No files found.
--- 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)



--- 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);