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

Commit ecfd198c authored by rago's avatar rago Committed by android-build-merger
Browse files

Fix potential NULL dereference in Visualizer effect am: 874f9e0b am: f060479b am: bcc7230b 

am: f4a63f67

Change-Id: I6a360ed595632dbb9d8e370c4561ec41d07c173f
parents 253e3ae0 f4a63f67

media/libeffects/visualizer/EffectVisualizer.cpp

+8 −3
Original line number Original line Diff line number Diff line
@@ -602,9 +602,14 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, 
    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)) {

            if (replySize == NULL) {

                ALOGV("VISUALIZER_CMD_MEASURE() error replySize NULL");

            } else {

                ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32

                ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32

                    " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32, *replySize,

                        " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32,

                    sizeof(int32_t) * MEASUREMENT_COUNT);

                        *replySize,

                        uint32_t(sizeof(int32_t)) * MEASUREMENT_COUNT);

            }

            android_errorWriteLog(0x534e4554, "30229821");

            android_errorWriteLog(0x534e4554, "30229821");

            return -EINVAL;

            return -EINVAL;

        }

        }