Commit 56dea281 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

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

Change-Id: I68084d5f6bfd4b209c738b94a0f31fe9db113d9f

parents b38df7b4 c2c470c7

libs/binder/Parcel.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -1236,7 +1236,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) {