commit 9825af9e9b76bda73154691164ca87abe9e7c45c
author Michael Lentine <mlentine@google.com> Tue Nov 04 01:17:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 04 01:17:56 2014 +0000
tree 447b635599c2f46fcfde5f65805c6ecc9642c514
parent fdfde83cc2a40c0b3cf36985bb03747bc310fe05
parent 98a51de1cc39b75633922d162b81b0b3362725e6

am 98a51de1: Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-dev automerge: b542285

* commit '98a51de1cc39b75633922d162b81b0b3362725e6':
  Fix native_handle_create to check if malloc fails

libcutils/native_handle.c

diff --git a/libcutils/native_handle.c b/libcutils/native_handle.c
index 4089968..9a4a5bb 100644
--- a/libcutils/native_handle.c
+++ b/libcutils/native_handle.c
@@ -30,9 +30,11 @@
     native_handle_t* h = malloc(
             sizeof(native_handle_t) + sizeof(int)*(numFds+numInts));
 
-    h->version = sizeof(native_handle_t);
-    h->numFds = numFds;
-    h->numInts = numInts;
+    if (h) {
+        h->version = sizeof(native_handle_t);
+        h->numFds = numFds;
+        h->numInts = numInts;
+    }
     return h;
 }