tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't assert while a callback is registered

Browse source 
If an assert fails while a callback is registered and some data
is delivered that attempts to invoke the callback, it'll cause a
segfault since the callback is allocated on a part of the stack
that's no longer valid.

Bug: 183362725
Merged-In: I3a1f8fbf15c24e344fde8e5b44bb93681ef47d38
Change-Id: I2b1895a1f5898b8971ffd820a7d619a09f12495d
Test: Run VTS
This commit is contained in:
Anthony Stange 2021-03-25 16:33:28 +00:00
parent e7b96104a4
commit 310d3ddef7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
View file

@ -390,6 +390,7 @@ TEST_F(SensorsHidlTest, InjectSensorEventData) {
// Wait for events to be written back to the Event FMQ
callback.waitForEvents(sensors, milliseconds(1000) /* timeout */);
getEnvironment()->unregisterCallback();
for (const auto& s : sensors) {
auto events = callback.getEvents(s.sensorHandle);
@ -409,7 +410,6 @@ TEST_F(SensorsHidlTest, InjectSensorEventData) {
ASSERT_EQ(lastEvent.u.vec3.status, injectedEvent.u.vec3.status);
}
getEnvironment()->unregisterCallback();
ASSERT_EQ(Result::OK, getSensors()->setOperationMode(OperationMode::NORMAL));
}
@ -711,7 +711,7 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfo>& sensors, bool
// Flush the sensor
for (int32_t i = 0; i < flushCalls; i++) {
Result flushResult = flush(sensor.sensorHandle);
ASSERT_EQ(flushResult, expectedResponse);
EXPECT_EQ(flushResult, expectedResponse);
}
}