diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:21 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:21 -0700 |
| commit | 4523c1d8b382d125cad47f96e23dc05436cb134a (patch) | |
| tree | 175f591b37fa736add00fb3484d314428755aece | |
| parent | 8882a5aee3ecad8199a5ccbb3a544a600b1119a3 (diff) | |
| parent | b93c4068519e564ea0a94277dad1277b303f5fdb (diff) | |
| download | android_external_flac-4523c1d8b382d125cad47f96e23dc05436cb134a.tar.gz android_external_flac-4523c1d8b382d125cad47f96e23dc05436cb134a.tar.bz2 android_external_flac-4523c1d8b382d125cad47f96e23dc05436cb134a.zip | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:26:16 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
| -rw-r--r-- | libFLAC/stream_decoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c index d3ff9ee..9e27667 100644 --- a/libFLAC/stream_decoder.c +++ b/libFLAC/stream_decoder.c @@ -1755,8 +1755,10 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre } 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; |