28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From bb6870bd6dc3acb183f44360c7cc6488656f47ea Mon Sep 17 00:00:00 2001
|
|
From: Jean-Yves Avenard <jyavenard@mozilla.com>
|
|
Date: Wed, 9 Dec 2015 09:55:16 +0100
|
|
Subject: [PATCH] Bug 1206211 - P2. Abort on OOM. r=kentuckyfriedtakahe,
|
|
a=sylvestre
|
|
|
|
---
|
|
.../frameworks/av/media/libstagefright/MPEG4Extractor.cpp | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
|
|
index 318152a..c6aaf1d 100644
|
|
--- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
|
|
+++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
|
|
@@ -517,6 +517,9 @@ status_t MPEG4Extractor::readMetaData() {
|
|
}
|
|
if (psshsize) {
|
|
char *buf = (char*)malloc(psshsize);
|
|
+ if (!buf) {
|
|
+ return ERROR_MALFORMED;
|
|
+ }
|
|
char *ptr = buf;
|
|
for (size_t i = 0; i < mPssh.size(); i++) {
|
|
memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
|
|
--
|
|
2.6.3
|
|
|