Merge "Fix a bug that would access uninitialized data." into tm-dev (7ab075cb) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -995,11 +995,15 @@ Result<std::vector<uint8_t>> FakeVehicleHardware::parseHexString(const std::stri
	template <class CallbackType, class RequestType>		template <class CallbackType, class RequestType>
	FakeVehicleHardware::PendingRequestHandler<CallbackType, RequestType>::PendingRequestHandler(		FakeVehicleHardware::PendingRequestHandler<CallbackType, RequestType>::PendingRequestHandler(
	FakeVehicleHardware* hardware)		FakeVehicleHardware* hardware)
	: mHardware(hardware), mThread([this] {		: mHardware(hardware) {
			// Don't initialize mThread in initialization list because mThread depends on mRequests and we
			// want mRequests to be initialized first.
			mThread = std::thread([this] {
	while (mRequests.waitForItems()) {		while (mRequests.waitForItems()) {
	handleRequestsOnce();		handleRequestsOnce();
	}		}
	}) {}		});
			}

	template <class CallbackType, class RequestType>		template <class CallbackType, class RequestType>
	void FakeVehicleHardware::PendingRequestHandler<CallbackType, RequestType>::addRequest(		void FakeVehicleHardware::PendingRequestHandler<CallbackType, RequestType>::addRequest(