commit c80480994e9d5e160d03a1511a37222b9be78a2d
author Erik de Castro Lopo <erikd@mega-nerd.com> Wed Dec 17 19:02:26 2014 +1100
committer gitbuildkicker <android-build@google.com> Fri Jul 22 16:17:27 2016 -0700
tree 2ddb54dcfcee82e5afbd525972a1c796e386abf1
parent 7b8718a4ceae706b5bdddbb2c6633a922d758f1b

src/libFLAC/stream_decoder.c : Fix NULL de-reference.

NULL de-reference can really only happen on a malformed file.
Found using afl (http://lcamtuf.coredump.cx/afl/).

Bug: 27211885
Change-Id: Iad7ced634d417df475050c8f379e0e95ec36b115

libFLAC/stream_decoder.c

diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c
index 7dff737..601d86f 100644
--- a/libFLAC/stream_decoder.c
+++ b/libFLAC/stream_decoder.c
@@ -1754,8 +1754,10 @@
 				}
 				else
 					length -= 4;
-				if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length))
+				if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length)) {
+					obj->num_comments = i;
 					return false; /* read_callback_ sets the state for us */
+				}
 				if (obj->comments[i].length > 0) {
 					if (length < obj->comments[i].length) {
 						obj->num_comments = i;