From c3e8884de570d95be251f7e04c60fb55428c7260 Mon Sep 17 00:00:00 2001 From: Shivaprasad Hongal Date: Wed, 4 Nov 2015 13:20:52 -0800 Subject: libmedia: add NULL check before accessing source and destination buffers. IMemory can return a NULL pointer or the destination buffer for readAt can be NULL. Check for NULL and report error. Change-Id: I9608de8ee3817a681c5c51ec7fdbd1bf207d9463 CRs-Fixed: 931744 --- media/libmedia/IMediaHTTPConnection.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'media/libmedia') diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp index 0dda0be..23fa084 100644 --- a/media/libmedia/IMediaHTTPConnection.cpp +++ b/media/libmedia/IMediaHTTPConnection.cpp @@ -124,6 +124,14 @@ struct BpMediaHTTPConnection : public BpInterface { ALOGE("got %zu, but memory has %zu", len, mMemory->size()); return ERROR_OUT_OF_RANGE; } + if(buffer == NULL) { + ALOGE("readAt got a NULL buffer"); + return UNKNOWN_ERROR; + } + if (mMemory->pointer() == NULL) { + ALOGE("readAt got a NULL mMemory->pointer()"); + return UNKNOWN_ERROR; + } memcpy(buffer, mMemory->pointer(), len); -- cgit v1.1