outputBuffer: avoid out-of-bounds-error in clearOutputBuffer()

I'm still not entirely certain why we index cb->metaChunkSet[] with currentChunk (and not currentMetaChunk), but shank told me that currentChunk is correct... git-svn-id: https://svn.musicpd.org/mpd/trunk@4814 09075e82-0dd4-0310-85a5-a0d7c8717e4f

outputBuffer: avoid out-of-bounds-error in clearOutputBuffer()
5ece1298 · Eric Wong · 64e8332f · 5ece1298
Commit 5ece1298 authored Sep 21, 2006 by Eric Wong
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

outputBuffer.c src/outputBuffer.c +3 -3

No files found.
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -41,18 +41,18 @@ void clearOutputBuffer(OutputBuffer * cb)
 {
 	int currentSet = 1;

-	currentChunk = -1;
 	cb->end = cb->begin;

 	/* be sure to reset metaChunkSets cause we are skipping over audio
 	 * audio chunks, and thus skipping over metadata */
-	if (sendMetaChunk == 0 && currentMetaChunk >= 0) {
+	if (currentChunk >= 0 && sendMetaChunk == 0 && currentMetaChunk >= 0) {
 		currentSet = cb->metaChunkSet[currentChunk];
 	}
 	clearAllMetaChunkSets(cb);
-	if (sendMetaChunk == 0 && currentMetaChunk >= 0) {
+	if (currentChunk >= 0 && sendMetaChunk == 0 && currentMetaChunk >= 0) {
 		cb->metaChunkSet[currentChunk] = currentSet;
 	}
+	currentChunk = -1;
 }

 void flushOutputBuffer(OutputBuffer * cb)