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

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

BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa2003 am: aca92198

Change-Id: I19571d507f1234ece0d63542688063f087cf6bd7
parents 6cf42dba aca92198
Loading
Loading
Loading
Loading
+11 −2
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;
@@ -281,6 +285,11 @@ status_t BnCrypto::onTransact(
            }

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