Snap for 6227608 from f66dd69e4c5aca2d6940d1ff5a437c275251f437 to r-keystone-qcom-release

Change-Id: I684879f3137a91363e0d378dcfd9699775fd2ad9
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c
index d364b0c..071398a 100644
--- a/libFLAC/stream_decoder.c
+++ b/libFLAC/stream_decoder.c
@@ -1632,6 +1632,8 @@
 
 	/* skip the rest of the block */
 	FLAC__ASSERT(used_bits % 8 == 0);
+	if (length < (used_bits / 8))
+		return false; /* read_callback_ sets the state for us */
 	length -= (used_bits / 8);
 	if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, length))
 		return false; /* read_callback_ sets the state for us */