diff options
| author | rago <rago@google.com> | 2016-10-13 01:55:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 01:55:22 +0000 |
| commit | b69cec19a6bc75d337566a66dbb2e937da464ce9 (patch) | |
| tree | 14f34775b492ed015cf123dd02710b72747de744 | |
| parent | d18f61490227171b6290ed1aff3185f68734746c (diff) | |
| parent | ae2849ff1d51bb2671140249155caadb29ca5756 (diff) | |
| download | android_hardware_qcom_audio-b69cec19a6bc75d337566a66dbb2e937da464ce9.tar.gz android_hardware_qcom_audio-b69cec19a6bc75d337566a66dbb2e937da464ce9.tar.bz2 android_hardware_qcom_audio-b69cec19a6bc75d337566a66dbb2e937da464ce9.zip | |
Fix potential NULL dereference in Visualizer effect am: 0c39abc483 am: 18b2de20a7 am: bcd048aea2 am: 67c5eb2059 am: 996c0f33a8
am: ae2849ff1d
Change-Id: Ic71b709d17623bef1c8580c9d9c194a029f1d368
| -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 69cea576..c56ebffc 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -869,9 +869,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; } |