summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-08-22 01:26:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-22 01:26:10 +0000
commit85df1e3a186a144d67206a9e1f05fb883c34a1ba (patch)
tree38fd9824f74921b982fdb070e7a1dda92875afdf
parent4e2a8e33b7b741a19ff658bad8623541a759e44f (diff)
parent63541e6d79b008f0f0632b2e0d368d3305c4f475 (diff)
downloadandroid_external_flac-85df1e3a186a144d67206a9e1f05fb883c34a1ba.tar.gz
android_external_flac-85df1e3a186a144d67206a9e1f05fb883c34a1ba.tar.bz2
android_external_flac-85df1e3a186a144d67206a9e1f05fb883c34a1ba.zip
am 63541e6d: am 9617601b: am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
* commit '63541e6d79b008f0f0632b2e0d368d3305c4f475': Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
-rw-r--r--libFLAC/stream_decoder.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c
index 7edf735..d13b23b 100644
--- a/libFLAC/stream_decoder.c
+++ b/libFLAC/stream_decoder.c
@@ -2749,8 +2749,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne
if(decoder->private_->frame.header.blocksize < predictor_order) {
send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
- /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */
- return false;
+ return true;
}
}
else {