From 635cfbae131b323b62ca50c6bffb0b801b57aafe Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 23 Sep 2010 08:49:21 +0200 Subject: decoder_control: use g_free() to manage mixramp allocations Be consistent with the rest of MPD, and don't use the non-portable header "malloc.h". --- src/decoder/flac_metadata.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/decoder/flac_metadata.c') diff --git a/src/decoder/flac_metadata.c b/src/decoder/flac_metadata.c index 68d15f6d4..f2f2f954d 100644 --- a/src/decoder/flac_metadata.c +++ b/src/decoder/flac_metadata.c @@ -87,7 +87,7 @@ flac_find_string_comment(const FLAC__StreamMetadata *block, int offset; size_t pos; int len; - unsigned char tmp, *p; + const unsigned char *p; *str = NULL; offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, @@ -101,10 +101,7 @@ flac_find_string_comment(const FLAC__StreamMetadata *block, return false; p = &block->data.vorbis_comment.comments[offset].entry[pos]; - tmp = p[len]; - p[len] = '\0'; - *str = strdup((char *)p); - p[len] = tmp; + *str = g_strndup((const char *)p, len); return true; } -- cgit v1.2.3