diff options
author | Robert Shih <robertshih@google.com> | 2015-08-22 01:26:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-22 01:26:10 +0000 |
commit | 85df1e3a186a144d67206a9e1f05fb883c34a1ba (patch) | |
tree | 38fd9824f74921b982fdb070e7a1dda92875afdf | |
parent | 4e2a8e33b7b741a19ff658bad8623541a759e44f (diff) | |
parent | 63541e6d79b008f0f0632b2e0d368d3305c4f475 (diff) | |
download | flac-85df1e3a186a144d67206a9e1f05fb883c34a1ba.tar.gz |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c index 7edf7359..d13b23b7 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 { |