diff options
| author | rago <rago@google.com> | 2016-10-07 18:13:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-24 00:58:57 -0800 |
| commit | 95b51a58de35079b2594203b1fa3459f6ce9d69f (patch) | |
| tree | f293b20bff1e96a0f95e0e6a495aeb31a80ad2e5 | |
| parent | 973fc364610f8e9031274247f077c2024a4f7b0f (diff) | |
Fix potential NULL dereference in Visualizer effect
Bug: 30229821
Test: fixing CL. Existing unit tests still pass.
Change-Id: I73d3fe413dd7590470c5b3b19569d6a7969c4dd8
(cherry picked from commit 0c39abc483ba980f7c417e57a0aa39139136c97a)
| -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 aaa586b4..716755b5 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -898,9 +898,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; } |