commit ee414d90b046e3e7feb4130b0567091a43c36702
author philipel <philipel@webrtc.org> Tue Nov 29 07:01:23 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Nov 29 15:01:29 2016 +0000
tree c884b8c53bd17bd476a6ce56a73f7c848f36935a
parent ad6f646a3f113df44be97edfe887cd6b737c42e7

Added sanity check to VCMDecodingState::UsingFlexibleMode to prevent OOB error.

BUG=chromium:667504

Review-Url: https://codereview.webrtc.org/2534883003
Cr-Commit-Position: refs/heads/master@{#15298}

webrtc/modules/video_coding/decoding_state.cc

diff --git a/webrtc/modules/video_coding/decoding_state.cc b/webrtc/modules/video_coding/decoding_state.cc
index 2295552..0c45ae3 100644
--- a/webrtc/modules/video_coding/decoding_state.cc
+++ b/webrtc/modules/video_coding/decoding_state.cc
@@ -291,8 +291,15 @@
 }
 
 bool VCMDecodingState::UsingFlexibleMode(const VCMFrameBuffer* frame) const {
-  return frame->CodecSpecific()->codecType == kVideoCodecVP9 &&
-         frame->CodecSpecific()->codecSpecific.VP9.flexible_mode;
+  bool is_flexible_mode =
+      frame->CodecSpecific()->codecType == kVideoCodecVP9 &&
+      frame->CodecSpecific()->codecSpecific.VP9.flexible_mode;
+  if (is_flexible_mode && frame->PictureId() == kNoPictureId) {
+    LOG(LS_WARNING) << "Frame is marked as using flexible mode but no"
+                    << "picture id is set.";
+    return false;
+  }
+  return is_flexible_mode;
 }
 
 // TODO(philipel): change how check work, this check practially