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

Commit a9296786 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d8 

Change-Id: I943db03ec26b3a7ec24636df46e2a21a472d52d2
parents 911b808a 4bbfb6d8

drm/libmediadrm/ICrypto.cpp

+11 −3
Original line number Diff line number Diff line
@@ -264,8 +264,12 @@ status_t BnCrypto::onTransact( 
        {

            CHECK_INTERFACE(ICrypto, data, reply);



            uint8_t uuid[16];

            data.read(uuid, sizeof(uuid));

            uint8_t uuid[16] = {0};

            if (data.read(uuid, sizeof(uuid)) != NO_ERROR) {

                android_errorWriteLog(0x534e4554, "144767096");

                reply->writeInt32(BAD_VALUE);

                return OK;

            }



            size_t opaqueSize = data.readInt32();

            void *opaqueData = NULL;
@@ -280,7 +284,11 @@ status_t BnCrypto::onTransact( 
                return NO_MEMORY;

            }



            data.read(opaqueData, opaqueSize);

            if (data.read(opaqueData, opaqueSize) != NO_ERROR) {

                android_errorWriteLog(0x534e4554, "144767096");

                reply->writeInt32(BAD_VALUE);

                return OK;

            }

            reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize));



            free(opaqueData);