commit 95b51a58de35079b2594203b1fa3459f6ce9d69f
author rago <rago@google.com> Fri Oct 07 18:13:29 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jan 24 00:58:57 2017 -0800
tree f293b20bff1e96a0f95e0e6a495aeb31a80ad2e5
parent 973fc364610f8e9031274247f077c2024a4f7b0f

Fix potential NULL dereference in Visualizer effect

Bug: 30229821

Test: fixing CL. Existing unit tests still pass.

Change-Id: I73d3fe413dd7590470c5b3b19569d6a7969c4dd8
(cherry picked from commit 0c39abc483ba980f7c417e57a0aa39139136c97a)

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index aaa586b..716755b 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -898,9 +898,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;
         }