diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:38:44 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:59:35 -0700 |
| commit | 8882a5aee3ecad8199a5ccbb3a544a600b1119a3 (patch) | |
| tree | 52c98cbccf502ab005204d32d4e7437d58ace09c /libFLAC | |
| parent | 9d7d223465b0012ecca7e2fca9ee1c7b8304ef79 (diff) | |
| parent | b499389da21d89d32deff500376c5ee4f8f0b04c (diff) | |
| download | android_external_flac-8882a5aee3ecad8199a5ccbb3a544a600b1119a3.tar.gz android_external_flac-8882a5aee3ecad8199a5ccbb3a544a600b1119a3.tar.bz2 android_external_flac-8882a5aee3ecad8199a5ccbb3a544a600b1119a3.zip | |
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)
Change-Id: I7a1ea6974021d9292c71518fc3cccbe3cba8515b
Diffstat (limited to 'libFLAC')
| -rw-r--r-- | libFLAC/stream_decoder.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c index 7d93bb7..d3ff9ee 100644 --- a/libFLAC/stream_decoder.c +++ b/libFLAC/stream_decoder.c @@ -1740,6 +1740,7 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre if (obj->num_comments > 0) { if (0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) { decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; + obj->num_comments = 0; return false; } for (i = 0; i < obj->num_comments; i++) { |