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