commit 19d780b8d939e71d2f98002493e17a474a149d88
author Steven Moreland <smoreland@google.com> Mon Oct 31 20:43:41 2022 +0000
committer Steven Moreland <smoreland@google.com> Mon Oct 31 20:43:43 2022 +0000
tree c8ff897116fdf509cb15e7c249b7a1f89a94ee17
parent 94f687884d36df3b9085f2050f281c88dcb329b7

ir impl point fixes

Removing UB.

Change-Id: I34b488329facbbcc760b01e72f2cb58945aa040b

ir/aidl/default/main.cpp

diff --git a/ir/aidl/default/main.cpp b/ir/aidl/default/main.cpp
index 7b6dda5..92376fc 100644
--- a/ir/aidl/default/main.cpp
+++ b/ir/aidl/default/main.cpp
@@ -36,7 +36,7 @@
     ::ndk::ScopedAStatus getCarrierFreqs(std::vector<ConsumerIrFreqRange>* _aidl_return) override;
     ::ndk::ScopedAStatus transmit(int32_t in_carrierFreqHz,
                                   const std::vector<int32_t>& in_pattern) override;
-    consumerir_device_t *mDevice;
+    consumerir_device_t *mDevice = nullptr;
 };
 
 ConsumerIr::ConsumerIr() {
@@ -49,7 +49,10 @@
     }
     ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &mDevice);
     if (ret < 0) {
+        // note - may want to make this a fatal error - otherwise the service will crash when it's used
         ALOGE("Can't open consumer IR transmitter, error: %d", ret);
+        // in case it's modified
+        mDevice = nullptr;
     }
 }