Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aea6f34 authored by rago's avatar rago Committed by Ethan Chen
Browse files

Fix potential NULL dereference in Visualizer effect 

Bug: 30229821

Test: fixing CL. Existing unit tests still pass.

Change-Id: I73d3fe413dd7590470c5b3b19569d6a7969c4dd8
(cherry picked from commit 0c39abc4)
parent 61fc2aeb

visualizer/offload_visualizer.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -894,9 +894,13 @@ int visualizer_command(effect_context_t * context, uint32_t cmdCode, uint32_t cm 
    case VISUALIZER_CMD_MEASURE: {

    case VISUALIZER_CMD_MEASURE: {

        if (pReplyData == NULL || replySize == NULL ||

        if (pReplyData == NULL || replySize == NULL ||

                *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {

                *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {

            ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %d <"

            if (replySize == NULL) {

                    "(sizeof(int32_t) * MEASUREMENT_COUNT) %d",

                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);

                        __func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);

            }

            android_errorWriteLog(0x534e4554, "30229821");

            android_errorWriteLog(0x534e4554, "30229821");

            return -EINVAL;

            return -EINVAL;

        }

        }