diff options
| author | rago <rago@google.com> | 2016-10-07 18:13:29 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-12-12 11:57:06 -0800 |
| commit | 8bb55861cda0462d59d6f96adc877c59690b12d4 (patch) | |
| tree | 14e4e9e20ef02046f1565ea05f086fc4bd71dc3b | |
| parent | a1200fb68f192e7e99608750822360236ab19ee8 (diff) | |
| download | hardware_qcom_audio-8bb55861cda0462d59d6f96adc877c59690b12d4.tar.gz hardware_qcom_audio-8bb55861cda0462d59d6f96adc877c59690b12d4.tar.bz2 hardware_qcom_audio-8bb55861cda0462d59d6f96adc877c59690b12d4.zip | |
Fix potential NULL dereference in Visualizer effect
Bug: 30229821
CYNGNOS-3312
Test: fixing CL. Existing unit tests still pass.
Change-Id: I73d3fe413dd7590470c5b3b19569d6a7969c4dd8
(cherry picked from commit 0c39abc483ba980f7c417e57a0aa39139136c97a)
(cherry picked from commit 2aa3913e968dfe1721f29ab86197178e1ad80b6b)
| -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 8c23498e..44d52c7d 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -874,9 +874,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; } |