mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-16 19:34:34 -05:00
af360bc9ea
wgetc873988898.patch -O telecomm-01.patch wget0fb5786dbf.patch -O mediaprovider-01.patch wget1a4b9ef510.patch -O wifi-01.patch wget364a1d9962.patch -O bluetooth-01.patch wget87a06448b9.patch -O settings-01.patch wgetaaba724a68.patch -O settings-02.patch wget507304e1f5.patch -O native-01.patch wget89489ff5dd.patch -O base-01.patch wgetd1765c4715.patch -O base-02.patch wgetcbb1a0ecd6.patch -O base-03.patch wget4725772c0b.patch -O base-04.patch wget19747f6923.patch -O base-05.patch wgete7a1aa9ed0.patch -O base-06.patch wget922a7860b1.patch -O base-07.patch wgeted183ed912.patch -O base-08.patch wgetc6fbe1330a.patch -O base-09.patch wget9141cac175.patch -O base-10.patch wget41235bcc67.patch -O av-01.patch wgeta89f704701.patch -O av-02.patch wget6d7cd80d77.patch -O av-03.patch wget75fc175a08.patch -O av-04.patch wgetb023ec300f.patch -O av-05.patch wgetc8117d1539.patch -O av-06.patch wgetf06d23d824.patch -O av-07.patch wget9c7408ab07.patch -O av-08.patch wgetcfbfcefb3c.patch -O launcher-01.patch wget4a27a7f162.patch -O libxml-01.patch Signed-off-by: Tad <tad@spotco.us>
27 lines
952 B
Diff
27 lines
952 B
Diff
From a89f704701e6af4a4809f4bb4911af88a023226f Mon Sep 17 00:00:00 2001
|
|
From: Kyle Zhang <kelzhan@google.com>
|
|
Date: Wed, 22 Feb 2023 20:14:34 +0000
|
|
Subject: [PATCH] Fix null pointer derefernce AMediaDrm_setPropertyByteArray
|
|
|
|
Bug: 234798181
|
|
Test: ndkDrmFuzzer
|
|
Change-Id: I0d2d92ce7be108a904e811048f90a93571862ebc
|
|
---
|
|
media/ndk/NdkMediaDrm.cpp | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
|
|
index f4674dea63..170506168f 100644
|
|
--- 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);
|