commit 339c986606573198e91e96a8f8ba964468c7a7be
author Yifan Hong <elsk@google.com> Fri Jul 17 12:47:45 2020 -0700
committer Yifan Hong <elsk@google.com> Fri Jul 17 12:57:58 2020 -0700
tree e6b48d628c70c53d566a337eb1e4ae65d09910b1
parent 7cac9425b0f8fb2ab04b8dc23029b57b1f5dd352

Fix segfault.

Fix code that incorrectly transforms a hidl_string to String8
by using size of another field.

Test: none
Fixes: 161210887
Change-Id: I54a11e9beab4c825905dda37b121e1fc85658215

health/1.0/default/convert.cpp

diff --git a/health/1.0/default/convert.cpp b/health/1.0/default/convert.cpp
index 7f1e3c4..3680d4d 100644
--- a/health/1.0/default/convert.cpp
+++ b/health/1.0/default/convert.cpp
@@ -79,7 +79,7 @@
 
     hc->batteryCurrentAvgPath =
         android::String8(c.batteryCurrentAvgPath.c_str(),
-                         c.batteryCurrentNowPath.size());
+                         c.batteryCurrentAvgPath.size());
 
     hc->batteryChargeCounterPath =
         android::String8(c.batteryChargeCounterPath.c_str(),