From 0a2c054f426104ed5364424d3ec88d6cffe203eb Mon Sep 17 00:00:00 2001 From: jackychen Date: Wed, 20 Apr 2016 13:24:15 -0700 Subject: [PATCH] Fix the issue of undefined-shift in VP8GetBit. BUG=chromium:603497 Review URL: https://codereview.webrtc.org/1888313002 Cr-Commit-Position: refs/heads/master@{#12450} --- webrtc/modules/video_coding/utility/vp8_header_parser.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/video_coding/utility/vp8_header_parser.cc b/webrtc/modules/video_coding/utility/vp8_header_parser.cc index 631385d0f2..d88fb6cc21 100644 --- a/webrtc/modules/video_coding/utility/vp8_header_parser.cc +++ b/webrtc/modules/video_coding/utility/vp8_header_parser.cc @@ -74,8 +74,9 @@ static int VP8GetBit(VP8BitReader* const br, int prob) { uint8_t range = br->range_; if (br->bits_ < 0) { VP8LoadNewBytes(br); + if (br->eof_) + return 0; } - const int pos = br->bits_; const uint8_t split = (range * prob) >> 8; const uint8_t value = static_cast(br->value_ >> pos);