commit b4842ae2d4a90f8a5d13e695b591a4e98661cffe
author rago <rago@google.com> Thu Oct 13 02:07:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 02:07:50 2016 +0000
tree a805785bd44aa78f785e85a46057623d8bce286c
parent c8a7c1a69dfaac61a4d892f74acc755424a41685
parent 1b963dc33c6c71907eee70474e7212309967efc2

Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a am: bcc7230bb9 am: f4a63f6765 am: ecfd198cda am: bae68c9e15 am: d36ebed01e
am: 1b963dc33c

Change-Id: I4fa9bb3b9c7fbf722e33a6be08c35989e45442b1

media/libeffects/visualizer/EffectVisualizer.cpp

diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp
index 91f9fc7..21fddb1 100644
--- a/media/libeffects/visualizer/EffectVisualizer.cpp
+++ b/media/libeffects/visualizer/EffectVisualizer.cpp
@@ -602,9 +602,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,
-                    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;
         }