summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2016-03-20 15:49:21 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2016-03-20 15:49:23 +1100
commit61607377ed7deba0f41c0d4cfa2e21b532c8d83c (patch)
treebf262a0fd5638a65156db01a774df14c171bb61a
parenta9f84425cfd5d1dbfb564730ca80d0b588cb4f24 (diff)
downloadflac-61607377ed7deba0f41c0d4cfa2e21b532c8d83c.tar.gz
stream_decoder.c: Set obj->num_comments before return
Make sure obj-num_comments gets set on failure conditions. Patch-from: Robert Shih <robertshih@google.com>
-rw-r--r--src/libFLAC/stream_decoder.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index e0f1b14d..da9fc492 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -1767,6 +1767,7 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
length -= obj->comments[i].length;
if (0 == (obj->comments[i].entry = safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) {
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
+ obj->num_comments = i;
return false;
}
memset (obj->comments[i].entry, 0, obj->comments[i].length) ;