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

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

Merge "Fix JsonWebKey potential null pointer dereference" into sc-dev

parents 914c4f6f cdce5dbd

drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ bool JsonWebKey::extractKeysFromJsonWebKeySet(const String8& jsonWebKeySet, 
    // all the base64 encoded keys. Each key is also stored separately as

    // a JSON object in mJsonObjects[1..n] where n is the total

    // number of keys in the set.

    if (!isJsonWebKeySet(mJsonObjects[0])) {

    if (mJsonObjects.size() == 0 || !isJsonWebKeySet(mJsonObjects[0])) {

        return false;

    }

drm/mediadrm/plugins/clearkey/hidl/JsonWebKey.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ bool JsonWebKey::extractKeysFromJsonWebKeySet(const std::string& jsonWebKeySet, 
    // all the base64 encoded keys. Each key is also stored separately as

    // a JSON object in mJsonObjects[1..n] where n is the total

    // number of keys in the set.

    if (!isJsonWebKeySet(mJsonObjects[0])) {

    if (mJsonObjects.size() == 0 || !isJsonWebKeySet(mJsonObjects[0])) {

        return false;

    }