diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-08-20 17:51:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 17:51:09 +0000 |
| commit | 649952f919f79c0aaf294f9f0be61d983c52da74 (patch) | |
| tree | 0f76b84cfc5024579efa67125d8645ba4648fc36 | |
| parent | fd4847848031c6642c9e47ab9e932de22f7f2972 (diff) | |
| parent | 1e5f0b6c187bb91dcbcb2da0479928d1577222f7 (diff) | |
| download | android_external_flac-649952f919f79c0aaf294f9f0be61d983c52da74.tar.gz android_external_flac-649952f919f79c0aaf294f9f0be61d983c52da74.tar.bz2 android_external_flac-649952f919f79c0aaf294f9f0be61d983c52da74.zip | |
am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.
* commit '1e5f0b6c187bb91dcbcb2da0479928d1577222f7':
libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow.
| -rw-r--r-- | libFLAC/stream_decoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libFLAC/stream_decoder.c b/libFLAC/stream_decoder.c index d13b23b..7edf735 100644 --- a/libFLAC/stream_decoder.c +++ b/libFLAC/stream_decoder.c @@ -2749,7 +2749,8 @@ 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; - return true; + /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */ + return false; } } else { |