am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created

* commit '861c3f56157813627467054f488ecff7d339f2b0':
  Verify that the native handle was created
This commit is contained in:
Adam Lesinski 2015-05-28 21:11:44 +00:00 committed by Android Git Automerger
commit 2c4f5fdeca

View File

@ -1215,6 +1215,10 @@ native_handle* Parcel::readNativeHandle() const
if (err != NO_ERROR) return 0; if (err != NO_ERROR) return 0;
native_handle* h = native_handle_create(numFds, numInts); native_handle* h = native_handle_create(numFds, numInts);
if (!h) {
return 0;
}
for (int i=0 ; err==NO_ERROR && i<numFds ; i++) { for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
h->data[i] = dup(readFileDescriptor()); h->data[i] = dup(readFileDescriptor());
if (h->data[i] < 0) err = BAD_VALUE; if (h->data[i] < 0) err = BAD_VALUE;