From 4c3ba337bacce05165d37f63dfa0b7e845c391e0 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 28 Apr 2015 13:47:27 -0700 Subject: Check allocation Bug: 20222446 Change-Id: I2f366a907886cd65e12a6f260a2ec77af6fb7b41 --- media/libmedia/IHDCP.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'media/libmedia/IHDCP.cpp') diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp index 79944ee..f3a8902 100644 --- a/media/libmedia/IHDCP.cpp +++ b/media/libmedia/IHDCP.cpp @@ -284,11 +284,17 @@ status_t BnHDCP::onTransact( 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); -- cgit v1.1