Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: webrtc/common_video/h264/h264_bitstream_parser.cc

Issue 2532973002: Sanity check parsed QP values from H264 bitstream (Closed)
Patch Set: add one last range check Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/common_video/h264/pps_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4ad0ed4b283dcbf22b29f359dfcdcd5b73732214 100644
--- a/webrtc/common_video/h264/h264_bitstream_parser.cc
+++ b/webrtc/common_video/h264/h264_bitstream_parser.cc
@@ -19,6 +19,12 @@
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/base/logging.h"
+namespace {
+const int kMaxAbsQpDeltaValue = 51;
+const int kMinQpValue = 0;
+const int kMaxQpValue = 51;
+}
+
namespace webrtc {
#define RETURN_ON_FAIL(x, res) \
@@ -251,6 +257,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;
}
@@ -291,7 +303,12 @@ void H264BitstreamParser::ParseBitstream(const uint8_t* bitstream,
bool H264BitstreamParser::GetLastSliceQp(int* qp) const {
if (!last_slice_qp_delta_ || !pps_)
return false;
- *qp = 26 + pps_->pic_init_qp_minus26 + *last_slice_qp_delta_;
+ const int parsed_qp = 26 + pps_->pic_init_qp_minus26 + *last_slice_qp_delta_;
+ if (parsed_qp < kMinQpValue || parsed_qp > kMaxQpValue) {
+ LOG(LS_ERROR) << "Parsed invalid QP from bitstream.";
+ return false;
+ }
+ *qp = parsed_qp;
return true;
}
« no previous file with comments | « no previous file | webrtc/common_video/h264/pps_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698