From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Sat, 15 Jun 2002 05:10:55 +0000 (+0000)
Subject: fix bug with infinite loop on remove-with-padding
X-Git-Tag: 1.2.0~1817
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14827676515a8f6b1bf9f065393ea5fed12aacf5;p=platform%2Fupstream%2Fflac.git

fix bug with infinite loop on remove-with-padding
---

diff --git a/src/metaflac/main.c b/src/metaflac/main.c
index 44951a2..e3ebdf0 100644
--- a/src/metaflac/main.c
+++ b/src/metaflac/main.c
@@ -1157,8 +1157,11 @@ FLAC__bool do_major_operation__remove(FLAC__Metadata_Chain *chain, const Command
 	block_number = 0;
 	while(ok && FLAC__metadata_iterator_next(iterator)) {
 		block_number++;
-		if(passes_filter(options, FLAC__metadata_iterator_get_block(iterator), block_number))
+		if(passes_filter(options, FLAC__metadata_iterator_get_block(iterator), block_number)) {
 			ok &= FLAC__metadata_iterator_delete_block(iterator, options->use_padding);
+			if(options->use_padding)
+				ok &= FLAC__metadata_iterator_next(iterator);
+		}
 	}
 
 	FLAC__metadata_iterator_delete(iterator);
@@ -1176,8 +1179,11 @@ FLAC__bool do_major_operation__remove_all(FLAC__Metadata_Chain *chain, const Com
 
 	FLAC__metadata_iterator_init(iterator, chain);
 
-	while(ok && FLAC__metadata_iterator_next(iterator))
+	while(ok && FLAC__metadata_iterator_next(iterator)) {
 		ok &= FLAC__metadata_iterator_delete_block(iterator, options->use_padding);
+		if(options->use_padding)
+			ok &= FLAC__metadata_iterator_next(iterator);
+	}
 
 	FLAC__metadata_iterator_delete(iterator);
 
@@ -1547,13 +1553,13 @@ FLAC__bool remove_vc_all(FLAC__StreamMetadata *block, FLAC__bool *needs_write)
 	FLAC__ASSERT(0 != needs_write);
 
 	if(0 != block->data.vorbis_comment.comments) {
-		FLAC__ASSERT(block->data.vorbis_comment.num_comments == 0);
+		FLAC__ASSERT(block->data.vorbis_comment.num_comments > 0);
 		if(!FLAC__metadata_object_vorbiscomment_resize_comments(block, 0))
 			return false;
 		*needs_write = true;
 	}
 	else {
-		FLAC__ASSERT(block->data.vorbis_comment.num_comments > 0);
+		FLAC__ASSERT(block->data.vorbis_comment.num_comments == 0);
 	}
 
 	return true;