diff options
| author | rago <rago@google.com> | 2016-10-07 18:13:29 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-12 12:33:59 -0800 |
| commit | 1ea3f59b67f9587afb45605f97f78a778cc11ab1 (patch) | |
| tree | 4ad94047407f4e4bc532f602e21eab5050b17c35 | |
| parent | 68d7c408b591763e793ff3239aaed111ba7c4266 (diff) | |
| download | android_hardware_qcom_audio-stable/cm-13.0-caf-8916-ZNH5Y.tar.gz android_hardware_qcom_audio-stable/cm-13.0-caf-8916-ZNH5Y.tar.bz2 android_hardware_qcom_audio-stable/cm-13.0-caf-8916-ZNH5Y.zip | |
Fix potential NULL dereference in Visualizer effectstable/cm-13.0-caf-8916-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 9a40d60f8cd59d78c405833492a6337c0be9b169)
| -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 f4cad35a..f0b92e20 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -848,9 +848,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; } |