diff options
| author | Devin Moore <devinmoore@google.com> | 2023-03-01 19:40:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-01 19:40:36 +0000 |
| commit | 5662dac29e8bfd744958507c12031b960c3512c4 (patch) | |
| tree | d83997343d88192a1f055a8bf27a6560fee2ca5c | |
| parent | e55af01f2f7403ee6f091224acb8d15647f708f5 (diff) | |
| parent | 6447432d8ec653b43efaa7cd1baf069ddae006ae (diff) | |
| download | native-5662dac29e8bfd744958507c12031b960c3512c4.tar.gz | |
Remove some new memory leaks from SensorManager am: 6447432d8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21548275
Change-Id: I731517ad9bbbb50ed0daa11c09e2c2ff9f761fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/sensor/ISensorServer.cpp | 12 | ||||
| -rw-r--r-- | libs/sensor/SensorManager.cpp | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libs/sensor/ISensorServer.cpp b/libs/sensor/ISensorServer.cpp index a6cacad374..93c95b98c5 100644 --- a/libs/sensor/ISensorServer.cpp +++ b/libs/sensor/ISensorServer.cpp @@ -66,7 +66,11 @@ public: v.setCapacity(n); while (n) { n--; - reply.read(s); + if(reply.read(s) != OK) { + ALOGE("Failed to read reply from getSensorList"); + v.clear(); + break; + } v.add(s); } return v; @@ -84,7 +88,11 @@ public: v.setCapacity(n); while (n) { n--; - reply.read(s); + if(reply.read(s) != OK) { + ALOGE("Failed to read reply from getDynamicSensorList"); + v.clear(); + break; + } v.add(s); } return v; diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp index 62f4b4e3e2..625612c0c9 100644 --- a/libs/sensor/SensorManager.cpp +++ b/libs/sensor/SensorManager.cpp @@ -162,6 +162,11 @@ status_t SensorManager::assertStateLocked() { mSensors = mSensorServer->getSensorList(mOpPackageName); size_t count = mSensors.size(); + if (count == 0) { + ALOGE("Failed to get Sensor list"); + mSensorServer.clear(); + return UNKNOWN_ERROR; + } mSensorList = static_cast<Sensor const**>(malloc(count * sizeof(Sensor*))); LOG_ALWAYS_FATAL_IF(mSensorList == nullptr, "mSensorList NULL"); |