diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/media/base/audio_discard_helper.cc | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/media/base/audio_discard_helper.cc')
| -rw-r--r-- | chromium/media/base/audio_discard_helper.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/media/base/audio_discard_helper.cc b/chromium/media/base/audio_discard_helper.cc index e932c44ab58..2929e6e430d 100644 --- a/chromium/media/base/audio_discard_helper.cc +++ b/chromium/media/base/audio_discard_helper.cc @@ -194,7 +194,10 @@ bool AudioDiscardHelper::ProcessBuffers( if (decoder_delay_) { // Delayed end discard only works if the decoder delay is less than a // single buffer. - DCHECK_LT(decoder_delay_, original_frame_count); + if (decoder_delay_ >= original_frame_count) { + DLOG(ERROR) << "Encountered invalid discard padding value."; + return false; + } // If the discard is >= the decoder delay, trim everything we can off the // end of this buffer and the rest from the start of the next. |