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

Commit 256a8492 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Fix use of uninitialized value in libmediadrm" into oc-dev am: 5924e3db am: 444b0377 

am: 74b97ba8

Change-Id: I2747be2fd19e31dd99c985492c955c5b2e2b0f62
parents 2c331aa9 74b97ba8

drm/libmediadrm/CryptoHal.cpp

+4 −1
Original line number Diff line number Diff line
@@ -332,10 +332,13 @@ ssize_t CryptoHal::decrypt(const uint8_t keyId[16], const uint8_t iv[16], 
            return status;

        }

        secure = false;

    } else {

    } else if (destination.mType == kDestinationTypeNativeHandle) {

        hDestination.type = BufferType::NATIVE_HANDLE;

        hDestination.secureMemory = hidl_handle(destination.mHandle);

        secure = true;

    } else {

        android_errorWriteLog(0x534e4554, "70526702");

        return UNKNOWN_ERROR;

    }



    ::SharedBuffer hSource;

drm/libmediadrm/ICrypto.cpp

+4 −0
Original line number Diff line number Diff line
@@ -369,6 +369,10 @@ status_t BnCrypto::onTransact( 
                    android_errorWriteLog(0x534e4554, "71389378");

                    return OK;

                }

            } else {

                reply->writeInt32(BAD_VALUE);

                android_errorWriteLog(0x534e4554, "70526702");

                return OK;

            }



            AString errorDetailMsg;