commit 0c739c59dd1a3d52beb82a353c13b6c853d93f5f
author Ricardo Garcia <rago@google.com> Mon Oct 10 21:42:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 10 21:42:42 2016 +0000
tree a90b27c43b30a0591d7385fb14fb983ee11e3be8
parent f260a0041777d2b706327916faf96b111024fba1
parent b66492c7686193a2d436939c4e046459af4e4bdb

Merge "Fix potential NULL dereference in Visualizer effect"

media/libeffects/visualizer/EffectVisualizer.cpp

diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp
index 0f65939..4c71907 100644
--- a/media/libeffects/visualizer/EffectVisualizer.cpp
+++ b/media/libeffects/visualizer/EffectVisualizer.cpp
@@ -600,9 +600,14 @@
     case VISUALIZER_CMD_MEASURE: {
         if (pReplyData == NULL || replySize == NULL ||
                 *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {
-            ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32
-                    " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32, *replySize,
-                    uint32_t(sizeof(int32_t)) * MEASUREMENT_COUNT);
+            if (replySize == NULL) {
+                ALOGV("VISUALIZER_CMD_MEASURE() error replySize NULL");
+            } else {
+                ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32
+                        " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32,
+                        *replySize,
+                        uint32_t(sizeof(int32_t)) * MEASUREMENT_COUNT);
+            }
             android_errorWriteLog(0x534e4554, "30229821");
             return -EINVAL;
         }