commit 4bbb2b6c56e9c3d88d2ad066a77f0cbef282a590
author android-build-team Robot <android-build-team-robot@google.com> Wed Jan 13 23:56:05 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 13 23:56:05 2021 +0000
tree 0521908890dd30f5b78eaf7be0f9fe44a56fd3f9
parent 5d69f119558f26cf40f368c3864cb73c843ecb2f
parent 8e7e0faa920ce620d4e054e189b1f2f434911439

Snap for 7080740 from 8e7e0faa920ce620d4e054e189b1f2f434911439 to mainline-documentsui-release

Change-Id: I46433c48376726e977d88985ee10e071ff14fc85

libFLAC/stream_decoder.c

diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c
index 071398a..7db34cf 100644
--- a/libFLAC/stream_decoder.c
+++ b/libFLAC/stream_decoder.c
@@ -1761,6 +1761,9 @@
 					}
 					memset (obj->comments[i].entry, 0, obj->comments[i].length) ;
 					if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) {
+						/* Current i-th entry is bad, so we delete it. */
+						free (obj->comments[i].entry) ;
+						obj->comments[i].entry = NULL ;
 						obj->num_comments = i;
 						goto skip;
 					}