diff options
| author | Robert Shih <robertshih@google.com> | 2015-08-22 00:51:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-22 00:51:06 +0000 |
| commit | 9617601b93153218bbd62b57acf6cedc7c089579 (patch) | |
| tree | fa607172a51170011043a907c3a475da4c60c24a | |
| parent | 1e5f0b6c187bb91dcbcb2da0479928d1577222f7 (diff) | |
| parent | cf87d19d206e108c8354ed31a9e4cba21ee7dac4 (diff) | |
| download | android_external_flac-9617601b93153218bbd62b57acf6cedc7c089579.tar.gz android_external_flac-9617601b93153218bbd62b57acf6cedc7c089579.tar.bz2 android_external_flac-9617601b93153218bbd62b57acf6cedc7c089579.zip | |
am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
* commit 'cf87d19d206e108c8354ed31a9e4cba21ee7dac4':
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 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 { |