commit c19703fe09ca9efa07d6ddd27eba54ddcc574144
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 09 23:08:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 09 23:08:52 2024 +0000
tree c064a06439c503d2662ce29b6585744f371f85dc
parent 08e7784348f4924f4373b49ef1a3f6718933de5d
parent 7eae30d5e3f7b268b199ec1d27948d35fb66b8ba

Merge "Fix a nullptr deref in ref VHAL." into main

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
index b56a190..82e357f 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
@@ -494,7 +494,11 @@
             }
 
             for (int areaId : areaIds) {
-                auto v = pool.obtain(*mPropStore->refreshTimestamp(property, areaId));
+                auto refreshedProp = mPropStore->refreshTimestamp(property, areaId);
+                VehiclePropValuePtr v = nullptr;
+                if (refreshedProp != nullptr) {
+                    v = pool.obtain(*refreshedProp);
+                }
                 if (v.get()) {
                     events.push_back(std::move(v));
                 }