decoder/flac: fix assertion failure in tag_free() call

Initialize flac_data.tag right after flac_data_init(). This way, the "goto fail" won't jump to the point where tag_free(NULL) can be called.

decoder/flac: fix assertion failure in tag_free() call
c0c51197 · Max Kellermann · 64ca94c9 · c0c51197 · c0c51197
Commit c0c51197 authored Jul 06, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

NEWS NEWS +2 -0

flac_plugin.c src/decoder/flac_plugin.c +1 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.1 (2009/??/??)
+* dcecoders:
+  - flac: fix assertion failure in tag_free() call
 * output:
  - httpd: include sys/types.h (fixes Mac OS X)
 * commands:

--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -394,6 +394,7 @@ flac_decode_internal(struct decoder * decoder,
 	if (!(flac_dec = flac_new()))
 		return;
 	flac_data_init(&data, decoder, input_stream);
+	data.tag = tag_new();

 #if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
        if(!FLAC__stream_decoder_set_metadata_respond(flac_dec, FLAC__METADATA_TYPE_VORBIS_COMMENT))
@@ -422,8 +423,6 @@ flac_decode_internal(struct decoder * decoder,
 		}
 	}

-	data.tag = tag_new();
-
 	if (!flac_process_metadata(flac_dec)) {
 		err = "problem reading metadata";
 		goto fail;