commit e81c762f070ec730c1cf597cd75ea51a10b04f7a
author Greg Kaiser <gkaiser@google.com> Tue Jul 07 05:55:04 2020 -0700
committer Greg Kaiser <gkaiser@google.com> Tue Jul 07 05:55:04 2020 -0700
tree e37484d57f8fbc247ec8bc77d2f03aef8bbfad5f
parent 1b400288c72ed2463e84832351ca7eedce7eb538

Avoid potential null dereference

Since our logic thinks 'replySize' could possibly be null, we
check the value prior to logging it.

Test: TreeHugger
Change-Id: I52e802157df2a28748f08f58ad492f8afd8dbfee

media/libeffects/hapticgenerator/EffectHapticGenerator.cpp

diff --git a/media/libeffects/hapticgenerator/EffectHapticGenerator.cpp b/media/libeffects/hapticgenerator/EffectHapticGenerator.cpp
index 3d3fce8..2a41ed5 100644
--- a/media/libeffects/hapticgenerator/EffectHapticGenerator.cpp
+++ b/media/libeffects/hapticgenerator/EffectHapticGenerator.cpp
@@ -420,7 +420,8 @@
 
         case EFFECT_CMD_SET_PARAM: {
             ALOGV("HapticGenerator_Command EFFECT_CMD_SET_PARAM cmdSize %d cmdData %p, "
-                  "*replySize %u, replyData %p", cmdSize, cmdData, *replySize, replyData);
+                  "*replySize %u, replyData %p", cmdSize, cmdData,
+                  replySize ? *replySize : 0, replyData);
             if (cmdData == nullptr || (cmdSize < (int) (sizeof(effect_param_t) + sizeof(int32_t)))
                 || replyData == nullptr || replySize == nullptr ||
                 *replySize != (int) sizeof(int32_t)) {