summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2016-03-22 21:30:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-22 21:30:41 +0000
commit3c74c11c30cdae95914c0b6a9228a3906b238c73 (patch)
treee7511613dd8f804dbb5c0ecb8ca011f8531ac9ed
parent093af41da9c2cef8e3bce26dd18cbbc517b2533b (diff)
parent4b075cb788972697b9128aae41446f3b4708951d (diff)
downloadandroid_external_flac-3c74c11c30cdae95914c0b6a9228a3906b238c73.tar.gz
android_external_flac-3c74c11c30cdae95914c0b6a9228a3906b238c73.tar.bz2
android_external_flac-3c74c11c30cdae95914c0b6a9228a3906b238c73.zip
Avoid free-before-initialize vulnerability in heap am: 6995c84 am: ca1a1ff am: b8c0a86 am: 02a513a am: 680f668
am: 4b075cb * commit '4b075cb788972697b9128aae41446f3b4708951d': Avoid free-before-initialize vulnerability in heap
-rw-r--r--libFLAC/stream_decoder.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c
index 77036ba..27bac3e 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 (0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
obj->num_comments = 0;
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
+ obj->num_comments = 0;
return false;
}
for (i = 0; i < obj->num_comments; i++) {