commit 98a51de1cc39b75633922d162b81b0b3362725e6
author Michael Lentine <mlentine@google.com> Tue Nov 04 00:04:42 2014 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 04 00:04:42 2014 +0000
tree ddaa08a21fece7592a5a86af51e48d0b1d7145c5
parent 68573fc5ef7d1a0805c0ca31cb97b1e3bb33cca9
parent b5422854361be038b812f1c0272c66cdb4618a4b

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

* commit 'b5422854361be038b812f1c0272c66cdb4618a4b':
  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;
 }