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".
This commit is contained in:
Max Kellermann
2010-09-23 08:49:21 +02:00
parent 922e51e8a9
commit 635cfbae13
3 changed files with 10 additions and 20 deletions

View File

@@ -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;
}

View File

@@ -285,10 +285,10 @@ parse_id3_mixramp(char **mixramp_start, char **mixramp_end,
(&frame->fields[2]));
if (g_ascii_strcasecmp(key, "mixramp_start") == 0) {
*mixramp_start = strdup(value);
*mixramp_start = g_strdup(value);
found = true;
} else if (g_ascii_strcasecmp(key, "mixramp_end") == 0) {
*mixramp_end = strdup(value);
*mixramp_end = g_strdup(value);
found = true;
}