diff options
author | Shivaprasad Hongal <shongal@codeaurora.org> | 2015-11-04 13:20:52 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:45:16 -0800 |
commit | c3e8884de570d95be251f7e04c60fb55428c7260 (patch) | |
tree | 27bf74ad66672c3e13e4e0124ec09e959e98834f /media/libmedia | |
parent | 06752d20a8a75a8a638aa9be122d8e120ce3e252 (diff) | |
download | frameworks_av-c3e8884de570d95be251f7e04c60fb55428c7260.zip frameworks_av-c3e8884de570d95be251f7e04c60fb55428c7260.tar.gz frameworks_av-c3e8884de570d95be251f7e04c60fb55428c7260.tar.bz2 |
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
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/IMediaHTTPConnection.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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<IMediaHTTPConnection> { 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); |