blob: 20bbd362812a20a61f211aecd300c0e4ec642e7c (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
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
|
