diff options
author | rago <rago@google.com> | 2016-10-07 18:13:29 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-12 12:34:30 -0800 |
commit | 79b18af19bffd578f07510654d2be9603a8b198d (patch) | |
tree | bfc5304d67705cac875068533c905bba5a803d14 | |
parent | 6b6945ca16f0c41395b9018b8109e7fe2032be21 (diff) | |
download | android_hardware_qcom_audio-stable/cm-13.0-caf-8994-ZNH5Y.tar.gz android_hardware_qcom_audio-stable/cm-13.0-caf-8994-ZNH5Y.tar.bz2 android_hardware_qcom_audio-stable/cm-13.0-caf-8994-ZNH5Y.zip |
Fix potential NULL dereference in Visualizer effectstable/cm-13.0-caf-8994-ZNH5Y
Bug: 30229821
CYNGNOS-3312
Test: fixing CL. Existing unit tests still pass.
Change-Id: I73d3fe413dd7590470c5b3b19569d6a7969c4dd8
(cherry picked from commit 0c39abc483ba980f7c417e57a0aa39139136c97a)
(cherry picked from commit fb2df5b44201c9af67f963c0495c23a8d640bbc6)
-rw-r--r-- | visualizer/offload_visualizer.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c index 15ff9410..04fb80c3 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -894,9 +894,13 @@ int visualizer_command(effect_context_t * context, uint32_t cmdCode, uint32_t cm 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; } |