commit 36b31c87807a4f8cd22e73da9bf2df7babdb906e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 03:39:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 03:39:43 2017 +0000
tree 4a0cbfa2381996b66003133a27063f4cb4a0d3f6
parent 760d007ba00ccafd9b0bc5839bc0141eadc40e0e
parent a04f6995de2e469cfb3164d88cf8fe54701c9124

Merge "libmedia: add NULL check before accessing source and destination buffers."

media/libmedia/IMediaHTTPConnection.cpp

diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp
index e4b717b..1bb8d67 100644
--- a/media/libmedia/IMediaHTTPConnection.cpp
+++ b/media/libmedia/IMediaHTTPConnection.cpp
@@ -124,6 +124,14 @@
             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);