From 81720da06dbcaa156bab5d3283df0faaa0334b63 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Sun, 6 Jun 2004 20:34:00 +0000 Subject: slightly safer copying of metadataChunk to MpdTag git-svn-id: https://svn.musicpd.org/mpd/trunk@1359 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/metadataChunk.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/metadataChunk.c') diff --git a/src/metadataChunk.c b/src/metadataChunk.c index 1deab3d90..9a4c35e10 100644 --- a/src/metadataChunk.c +++ b/src/metadataChunk.c @@ -11,13 +11,21 @@ void initMetadataChunk(MetadataChunk * chunk) { chunk->title = -1; } +#define dupElementToTag(string, element) { \ + if(element >= 0 && element < METADATA_BUFFER_LENGTH) { \ + string = strdup(chunk->buffer+element); \ + } \ +} + MpdTag * metadataChunkToMpdTagDup(MetadataChunk * chunk) { MpdTag * ret = newMpdTag(); - if(chunk->name >= 0) ret->name = strdup(chunk->buffer+chunk->name); - if(chunk->artist >= 0) ret->artist = strdup(chunk->buffer+chunk->artist); - if(chunk->album >= 0) ret->album = strdup(chunk->buffer+chunk->album); - if(chunk->title >= 0) ret->title = strdup(chunk->buffer+chunk->title); + chunk->buffer[METADATA_BUFFER_LENGTH] = '\0'; + + dupElementToTag(ret->name, chunk->name); + dupElementToTag(ret->title, chunk->title); + dupElementToTag(ret->artist, chunk->artist); + dupElementToTag(ret->album, chunk->album); return ret; } -- cgit v1.2.3