Fix null pointer derefernce AMediaDrm_setPropertyByteArray

Bug: 234798181 Test: ndkDrmFuzzer Change-Id: I0d2d92ce7be108a904e811048f90a93571862ebc
GrapheneOS-Archive · Sep 18, 2023 · a89f704 · a89f704
1 parent 41235bc
commit a89f704
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
@@ -758,6 +758,9 @@ media_status_t AMediaDrm_setPropertyString(AMediaDrm *mObj,
 EXPORT
 media_status_t AMediaDrm_setPropertyByteArray(AMediaDrm *mObj,
         const char *propertyName, const uint8_t *value, size_t valueSize) {
+    if (!mObj || mObj->mDrm == NULL) {
+        return AMEDIA_ERROR_INVALID_OBJECT;
+    }
 
     Vector<uint8_t> byteArray;
     byteArray.appendArray(value, valueSize);