commit b4e21fe2fbc78db6cf4bdd53c9b5331772a04dbb
author rago <rago@google.com> Thu Oct 13 02:27:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 02:27:28 2016 +0000
tree f36b38395a068a9f89265b4ab07bf839017db18e
parent e0827cb05ddc4ad659fcb4d504659bb97ec03444
parent 7fc03ff68084ae8e75daf678d03dc3accc08dc64

Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a am: bcc7230bb9 am: f4a63f6765 am: ecfd198cda am: bae68c9e15 am: d36ebed01e am: 1b963dc33c am: b4842ae2d4 am: 59f22c99fe
am: 7fc03ff680

Change-Id: I373bb242dd64295ff240e07bc96bce3a59fa5060

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