commit d584e7639533c8c382bd32d9321524c9bdef14d4
author Linux Build Service Account <lnxbuild@localhost> Fri Nov 13 20:02:52 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 13 20:02:52 2015 -0800
tree c5f0b676f4fc129e2c4996e749fb1b15efa9fb29
parent f29ff141db6791aa867ec9f081c9eb77f80b0440
parent 99ef37805e9efcf6285d0804ece4dbfbbe3b4c76

Merge "sdm: HWDevice: Set correct HWDisplayMode" into dev-1.0

sdm/libs/hwc/hwc_session.cpp

diff --git a/sdm/libs/hwc/hwc_session.cpp b/sdm/libs/hwc/hwc_session.cpp
index 9393b81..dbd06a7 100644
--- a/sdm/libs/hwc/hwc_session.cpp
+++ b/sdm/libs/hwc/hwc_session.cpp
@@ -232,7 +232,7 @@
                         hwc_display_contents_1_t **displays) {
   DTRACE_SCOPED();
 
-  if (!device || !displays) {
+  if (!device || !displays || num_displays > HWC_NUM_DISPLAY_TYPES) {
     return -EINVAL;
   }
 
@@ -312,7 +312,7 @@
 
   SEQUENCE_EXIT_SCOPE_LOCK(locker_);
 
-  if (!device || !displays) {
+  if (!device || !displays || num_displays > HWC_NUM_DISPLAY_TYPES) {
     return -EINVAL;
   }