commit 8e79453f54fc9945167b85997b257df366ebe231
author rago <rago@google.com> Thu Oct 13 02:41:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 02:41:06 2016 +0000
tree b2682dc74561ba1401e3fc8546a2bfc73b99edd3
parent 9c50bd83f3d1c8aaa447505d6771ebba082e5878
parent fa7e928944e7db84c2e85266bf170c29972b47b9

Fix potential NULL dereference in Visualizer effect am: 0c39abc483 am: 18b2de20a7 am: bcd048aea2 am: 67c5eb2059 am: 996c0f33a8 am: ae2849ff1d am: b69cec19a6 am: e8b78f62df am: a8f0a1ff6e am: bd78fe1fef am: dc3ca4acef am: 6ae401595d
am: fa7e928944

Change-Id: I511fb00f8b5d289a218e0a29234ceab993aa8429

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 69cea57..c56ebff 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -869,9 +869,13 @@
     case VISUALIZER_CMD_MEASURE: {
         if (pReplyData == NULL || replySize == NULL ||
                 *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {
-            ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %d <"
-                    "(sizeof(int32_t) * MEASUREMENT_COUNT) %d",
-                    __func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);
+            if (replySize == NULL) {
+                ALOGV("%s VISUALIZER_CMD_MEASURE error replySize NULL", __func__);
+            } else {
+                ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %u <"
+                        "(sizeof(int32_t) * MEASUREMENT_COUNT) %zu",
+                        __func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);
+            }
             android_errorWriteLog(0x534e4554, "30229821");
             return -EINVAL;
         }