commit bcd048aea24a7781de591c5536c8823ed5a842fe
author rago <rago@google.com> Thu Oct 13 01:27:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 01:27:23 2016 +0000
tree 2269ad538196eeb72e75d5a9dc3193f1a4a9f184
parent 38dcbab6b3b1efb2a953db3b8394a78875a7510c
parent 18b2de20a702c70add01e46a9cd631b3fe9a5ce1

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

Change-Id: I131f617ee43a13dc8d50a1aa03eb10076db9f0b5

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index fdfdbe5..6f03711 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -826,9 +826,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;
         }