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

Commit 7540cb56 authored by Treehugger Robot's avatar Treehugger Robot Committed by Kyle Zhang
Browse files

[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am: e1391b7d am: 2f92d85e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2487975



Bug: 230793853
Bug: 274153915
Change-Id: Id0e98d5a1c742f9842de680ad5b87cf47e0fbec9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fcae3cd 2f92d85e

drm/mediadrm/plugins/clearkey/aidl/CryptoPlugin.cpp

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ using ::aidl::android::hardware::drm::Status; 
        *_aidl_return = static_cast<ssize_t>(offset);

        return toNdkScopedAStatus(Status::OK);

    } else if (in_args.mode == Mode::AES_CTR) {

        if (!mSession) return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE,

                    "session not found");

        size_t bytesDecrypted{};

        std::vector<int32_t> clearDataLengths;

        std::vector<int32_t> encryptedDataLengths;
@@ -149,6 +151,7 @@ using ::aidl::android::hardware::drm::Status; 
            detailedError = "invalid decrypt parameter size";

            return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE, detailedError);

        }



        auto res =

                mSession->decrypt(in_args.keyId.data(), in_args.iv.data(),

                                  srcPtr, static_cast<uint8_t*>(destPtr),