commit 91eb3ed2242adc35e19163e7c69ba8bdd50f943a
author Marco Nelissen <marcone@google.com> Mon Mar 21 20:47:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 21 20:47:45 2016 +0000
tree f4c2027d18409a92c53f2c0306d2ecfc43684233
parent 1c0e48076f569d5d5d732cb0c4fe8efa3334a741
parent 7b5795dc605529246b861ff8d8be7c7a58c5bfe2

Fix OMX_IndexParamConsumerUsageBits size check am: 788b0b6 am: 63002af am: 8777bfb am: b7bd841
am: 7b5795d

* commit '7b5795dc605529246b861ff8d8be7c7a58c5bfe2':
  Fix OMX_IndexParamConsumerUsageBits size check

media/libmedia/IOMX.cpp

diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp
index ea4a966..61fba35 100644
--- a/media/libmedia/IOMX.cpp
+++ b/media/libmedia/IOMX.cpp
@@ -718,11 +718,12 @@
             void *params = NULL;
             size_t pageSize = 0;
             size_t allocSize = 0;
-            if ((index == (OMX_INDEXTYPE) OMX_IndexParamConsumerUsageBits && size < 4) ||
-                    (code != SET_INTERNAL_OPTION && size < 8)) {
+            bool isUsageBits = (index == (OMX_INDEXTYPE) OMX_IndexParamConsumerUsageBits);
+            if ((isUsageBits && size < 4) ||
+                    (!isUsageBits && code != SET_INTERNAL_OPTION && size < 8)) {
                 // we expect the structure to contain at least the size and
                 // version, 8 bytes total
-                ALOGE("b/27207275 (%zu)", size);
+                ALOGE("b/27207275 (%zu) (%d/%d)", size, int(index), int(code));
                 android_errorWriteLog(0x534e4554, "27207275");
             } else {
                 err = NO_MEMORY;