make sure Parcel handles 0-sized LightFlatenables (2098517e) · Commits · e / os / android_frameworks_native

include/binder/Parcel.h

+12 −6

Original line number	Diff line number	Diff line
		@@ -285,10 +285,13 @@ status_t Parcel::write(const LightFlattenable<T>& val) {
		return err;
		}
		}
		if (size) {
		void* buffer = writeInplace(size);
		return buffer == NULL ? NO_MEMORY :
		val.flatten(buffer);
		}
		return NO_ERROR;
		}

		template<typename T>
		status_t Parcel::read(LightFlattenable<T>& val) const {
		@@ -303,10 +306,13 @@ status_t Parcel::read(LightFlattenable<T>& val) const {
		}
		size = s;
		}
		if (size) {
		void const* buffer = readInplace(size);
		return buffer == NULL ? NO_MEMORY :
		val.unflatten(buffer, size);
		}
		return NO_ERROR;
		}

		// ---------------------------------------------------------------------------