diff options
| author | Robert Shih <robertshih@google.com> | 2015-08-22 01:33:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-22 01:33:22 +0000 |
| commit | 58dd0a9135a5c1d4ba7edc2b8dbf5699ab5ef68c (patch) | |
| tree | 3647d19671592c75fa7c4c131f866344c0ad6d6b /libFLAC | |
| parent | cb84173d16832f42747931c7b64dfed08f964da6 (diff) | |
| parent | 85df1e3a186a144d67206a9e1f05fb883c34a1ba (diff) | |
| download | android_external_flac-58dd0a9135a5c1d4ba7edc2b8dbf5699ab5ef68c.tar.gz android_external_flac-58dd0a9135a5c1d4ba7edc2b8dbf5699ab5ef68c.tar.bz2 android_external_flac-58dd0a9135a5c1d4ba7edc2b8dbf5699ab5ef68c.zip | |
am 85df1e3a: am 63541e6d: am 9617601b: am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
* commit '85df1e3a186a144d67206a9e1f05fb883c34a1ba':
Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow."
Diffstat (limited to 'libFLAC')
| -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 { |