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

Commit eee86b00 authored by Ricardo Garcia's avatar Ricardo Garcia Committed by Android (Google) Code Review
Browse files

Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev

parents 8caef852 874f9e0b

media/libeffects/visualizer/EffectVisualizer.cpp

+8 −3
Original line number Diff line number Diff line
@@ -600,9 +600,14 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, 
    case VISUALIZER_CMD_MEASURE: {

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

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

            if (replySize == NULL) {

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

            } else {

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

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

                    sizeof(int32_t) * MEASUREMENT_COUNT);

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

                        *replySize,

                        uint32_t(sizeof(int32_t)) * MEASUREMENT_COUNT);

            }

            android_errorWriteLog(0x534e4554, "30229821");

            return -EINVAL;

        }