commit 67c5eb205963b7e6a6a66d66f0ef3772fae37cc3
author rago <rago@google.com> Thu Oct 13 01:33:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 01:33:49 2016 +0000
tree d30ec7becf7106da8c3b347fff26e40a9e9e9af6
parent 624981438d5b6ae90d500394102b220c52b1f04c
parent bcd048aea24a7781de591c5536c8823ed5a842fe

Fix potential NULL dereference in Visualizer effect am: 0c39abc483 am: 18b2de20a7
am: bcd048aea2

Change-Id: I12fcb8d2ad71a3323ed5d8abe8a821971a74fe77

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 3231f47..782ec88 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -843,9 +843,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;
         }