From 748459cdacac28e254317e6e1ee17367ab7c1a42 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 8 Sep 2004 00:49:30 +0000 Subject: [PATCH] fix bug copying a null vorbis comment entry --- src/libFLAC/metadata_object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index 1e718ef4..589357b6 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -190,16 +190,17 @@ static FLAC__bool vorbiscomment_set_entry_(FLAC__StreamMetadata *object, FLAC__S FLAC__ASSERT(0 != dest); FLAC__ASSERT(0 != src); FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT); - FLAC__ASSERT((0 != src->entry && src->length > 0) || (0 == src->entry && src->length == 0 && copy == false)); + FLAC__ASSERT((0 != src->entry && src->length > 0) || (0 == src->entry && src->length == 0)); save = dest->entry; /* do the copy first so that if we fail we leave the object untouched */ - if(copy) { + if(copy && (0 != src->entry && src->length > 0)) { if(!copy_vcentry_(dest, src)) return false; } else { + /* either we're not copying or the src is null */ *dest = *src; }