commit b0fdf568103b281e0f9cbe806bf9937314b00e34
author rago <rago@google.com> Thu Oct 13 02:27:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 02:27:58 2016 +0000
tree 3d48a73a28480ab9f2111629f32c4ea38e5dfa4a
parent 5ce87b7a841e537955cb3bf3a93eda17318c9a99
parent dc3ca4acef3136cbb2a577225656413d478285de

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

Change-Id: I1031bf9a0ecd5d8a0117b5596f91836278469482

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;
         }