Commit 8a45b3e0 authored May 09, 2016 by Marco Nelissen Committed by android-build-merger May 09, 2016

Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c am:...

Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c am: 275c9f60 am: 853702ce am: 775f2e6d am: 82afbe22 am: c2c470c7 am: 56dea281 am: bca20d83 am: a8244873 am: 93bf31f5 am: f91c66a9 am: fb6342d2
am: c55b4b69

* commit 'c55b4b69':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I8dbb2e0baf3ee4274d0c184972402862674f4571

parents 163ae0dc c55b4b69

libs/binder/Parcel.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -1976,7 +1976,13 @@ native_handle* Parcel::readNativeHandle() const

		for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
		h->data[i] = dup(readFileDescriptor());
		if (h->data[i] < 0) err = BAD_VALUE;
		if (h->data[i] < 0) {
		for (int j = 0; j < i; j++) {
		close(h->data[j]);
		}
		native_handle_delete(h);
		return 0;
		}
		}
		err = read(h->data + numFds, sizeof(int)*numInts);
		if (err != NO_ERROR) {