Index: webrtc/common_video/h264/h264_bitstream_parser.cc |
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.cc b/webrtc/common_video/h264/h264_bitstream_parser.cc |
index 048cdd2f6ea58da64b7d4b37507c2e6078a88865..3a76d3e6d7967918346d86e72663b1ff41c6e4ef 100644 |
--- a/webrtc/common_video/h264/h264_bitstream_parser.cc |
+++ b/webrtc/common_video/h264/h264_bitstream_parser.cc |
@@ -19,6 +19,10 @@ |
#include "webrtc/common_video/h264/h264_common.h" |
#include "webrtc/base/logging.h" |
+namespace { |
+int kMaxAbsQpDeltaValue = 51; |
magjed_webrtc
2016/11/29 10:34:32
nit: const
|
+} |
+ |
namespace webrtc { |
#define RETURN_ON_FAIL(x, res) \ |
@@ -251,6 +255,12 @@ H264BitstreamParser::Result H264BitstreamParser::ParseNonParameterSetNalu( |
int32_t last_slice_qp_delta; |
RETURN_INV_ON_FAIL( |
slice_reader.ReadSignedExponentialGolomb(&last_slice_qp_delta)); |
+ if (abs(last_slice_qp_delta) > kMaxAbsQpDeltaValue) { |
+ // Something has gone wrong, and the parsed value is invalid. |
+ LOG(LS_WARNING) << "Parsed QP value out of range."; |
+ return kInvalidStream; |
+ } |
+ |
last_slice_qp_delta_ = rtc::Optional<int32_t>(last_slice_qp_delta); |
return kOk; |
} |