commit 170c73beeaf65e3a5ce8e969a9100c14557961c1
author Marco Nelissen <marcone@google.com> Tue Apr 28 13:47:27 2015 -0700
committer Marco Nelissen <marcone@google.com> Tue Apr 28 15:10:31 2015 -0700
tree d94260b7c6d335795ec84608aabfde7235736730
parent 7725022e8bbff4160e46055ebaa4128dff86821c

Check allocation

Bug: 20222446
Change-Id: I2f366a907886cd65e12a6f260a2ec77af6fb7b41

media/libmedia/IHDCP.cpp

diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp
index 9122f75..0f9f58d 100644
--- a/media/libmedia/IHDCP.cpp
+++ b/media/libmedia/IHDCP.cpp
@@ -273,11 +273,17 @@
             size_t offset = data.readInt32();
             size_t size = data.readInt32();
             uint32_t streamCTR = data.readInt32();
-            void *outData = malloc(size);
+            void *outData = NULL;
             uint64_t inputCTR;
 
-            status_t err = encryptNative(graphicBuffer, offset, size,
-                                         streamCTR, &inputCTR, outData);
+            status_t err = ERROR_OUT_OF_RANGE;
+
+            outData = malloc(size);
+
+            if (outData != NULL) {
+                err = encryptNative(graphicBuffer, offset, size,
+                                             streamCTR, &inputCTR, outData);
+            }
 
             reply->writeInt32(err);