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

Commit e20c3840 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am:... 

Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am: e1391b7d am: 2f92d85e" into udc-dev am: 7f7048c5

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



Change-Id: I8490ed61eafae680d239481a1a6870acb61324f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7863e09 7f7048c5

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