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

Commit e4e7b91e authored by Robert Shih's avatar Robert Shih
Browse files

Revert "BnCrypto: fix use-before-init in CREATE_PLUGIN" 

This reverts commit 51aa2003.

Reason for revert: DRM playback regression

Bug: 149067513
Change-Id: I8d8a51efd57c52b444363ce5f5bd04316b2f4bb8
Merged-In: Id67dc9e793ee886e4cc49370d800c7f3580df313
Merged-In: I81ff7cde5e1693f05c90380e879f74d0c4bce5f1
parent 51aa2003

drm/libmediadrm/ICrypto.cpp

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

            CHECK_INTERFACE(ICrypto, data, reply);



            uint8_t uuid[16] = {0};

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

                android_errorWriteLog(0x534e4554, "144767096");

                reply->writeInt32(BAD_VALUE);

                return OK;

            }

            uint8_t uuid[16];

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



            size_t opaqueSize = data.readInt32();

            void *opaqueData = NULL;
@@ -285,11 +281,6 @@ 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);