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

Commit 98389e34 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libaudioclient: Fix error handling in AudioEffect::set 

Zero-initialize effect UUID string recipient arrays
to prevent logging random data.

Bug: 152189317
Test: m
Change-Id: I70e6cd509d7c4d1ce1cbd3a250b1371d2d5af4a7
Merged-In: I70e6cd509d7c4d1ce1cbd3a250b1371d2d5af4a7
parent bc0f22e3

media/libaudioclient/AudioEffect.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -144,11 +144,13 @@ status_t AudioEffect::set(const effect_uuid_t *type, 
            &mStatus, &mId, &enabled);

            &mStatus, &mId, &enabled);





    if (iEffect == 0 || (mStatus != NO_ERROR && mStatus != ALREADY_EXISTS)) {

    if (iEffect == 0 || (mStatus != NO_ERROR && mStatus != ALREADY_EXISTS)) {

        char typeBuffer[64], uuidBuffer[64];

        char typeBuffer[64] = {}, uuidBuffer[64] = {};

        guidToString(type, typeBuffer, sizeof(typeBuffer));

        guidToString(type, typeBuffer, sizeof(typeBuffer));

        guidToString(uuid, uuidBuffer, sizeof(uuidBuffer));

        guidToString(uuid, uuidBuffer, sizeof(uuidBuffer));

        ALOGE("set(): AudioFlinger could not create effect %s / %s, status: %d",

        ALOGE("set(): AudioFlinger could not create effect %s / %s, status: %d",

                typeBuffer, uuidBuffer, mStatus);

                type != nullptr ? typeBuffer : "NULL",

                uuid != nullptr ? uuidBuffer : "NULL",

                mStatus);

        if (iEffect == 0) {

        if (iEffect == 0) {

            mStatus = NO_INIT;

            mStatus = NO_INIT;

        }

        }