commit 34669ce55e88c0b17fa75e90ea600b3fe908fc2a
author Marco Nelissen <marcone@google.com> Mon Oct 08 14:42:24 2018 -0700
committer Marco Nelissen <marcone@google.com> Mon Oct 08 14:42:24 2018 -0700
tree 154eb530dade66a379589740df52eab6b615fd3b
parent 4cc873cc1dcf9e69572c2e52b68af1aebea0ad98

AMediaFormat_copy: check args

Bug: 111407253
Test: build
Change-Id: I66204937521d0e9d81f0153247ad0984be6e4395

media/ndk/NdkMediaFormat.cpp

diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp
index 249c76e..503f726 100644
--- a/media/ndk/NdkMediaFormat.cpp
+++ b/media/ndk/NdkMediaFormat.cpp
@@ -59,6 +59,9 @@
 
 EXPORT
 media_status_t AMediaFormat_copy(AMediaFormat *to, AMediaFormat *from) {
+    if (!to || !from) {
+        return AMEDIA_ERROR_INVALID_PARAMETER;
+    }
     to->mFormat->clear();
     to->mFormat->extend(from->mFormat);
     return AMEDIA_OK;