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

Commit ea92c694 authored by Edwin Wong's avatar Edwin Wong Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into oc-mr1-dev

parents ae59a1c2 db90c38b

drm/mediadrm/plugins/clearkey/DrmPlugin.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,7 @@ status_t DrmPlugin::queryKeyStatus( 
    }

    }





    infoMap.clear();

    infoMap.clear();

    android::Mutex::Autolock lock(mPlayPolicyLock);

    for (size_t i = 0; i < mPlayPolicy.size(); ++i) {

    for (size_t i = 0; i < mPlayPolicy.size(); ++i) {

        infoMap.add(mPlayPolicy.keyAt(i), mPlayPolicy.valueAt(i));

        infoMap.add(mPlayPolicy.keyAt(i), mPlayPolicy.valueAt(i));

    }

    }

drm/mediadrm/plugins/clearkey/DrmPlugin.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ public: 
private:

private:

    void setPlayPolicy();

    void setPlayPolicy();





    android::Mutex mPlayPolicyLock;

    mutable android::Mutex mPlayPolicyLock;

    android::KeyedVector<android::String8, android::String8> mPlayPolicy;

    android::KeyedVector<android::String8, android::String8> mPlayPolicy;

    SessionLibrary* mSessionLibrary;

    SessionLibrary* mSessionLibrary;