diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-07-14 19:58:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 19:58:29 +0000 |
| commit | 45d9bab12fcebcf718a51df5efc1fb3534b26533 (patch) | |
| tree | 2ddb54dcfcee82e5afbd525972a1c796e386abf1 | |
| parent | 4b075cb788972697b9128aae41446f3b4708951d (diff) | |
| parent | 4ced2ff0bda2187197c42447e095f972975b0f1a (diff) | |
| download | android_external_flac-45d9bab12fcebcf718a51df5efc1fb3534b26533.tar.gz android_external_flac-45d9bab12fcebcf718a51df5efc1fb3534b26533.tar.bz2 android_external_flac-45d9bab12fcebcf718a51df5efc1fb3534b26533.zip | |
src/libFLAC/stream_decoder.c : Fix NULL de-reference. am: 83a817d200 am: 5e39e0d829 am: 10c2965d9b am: 1fa69f344f am: 709f40556d am: 1118807bd4 am: 3424de3df7 am: a5a50068aa
am: 4ced2ff0bd
Change-Id: I1e51eec88b966d19ac0fa26f5090c21023472b89
| -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 7dff737..601d86f 100644 --- a/libFLAC/stream_decoder.c +++ b/libFLAC/stream_decoder.c @@ -1754,8 +1754,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; |