commit c8ed5eb6157858b66cb1f7599237d5b43f4440ff
author Enrico Granata <egranata@google.com> Wed Apr 26 17:21:14 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 26 17:21:15 2017 +0000
tree 32b7a80f9c8c2b06d541d0cfdaf3f50af33666ef
parent fd2259e756908383689214ef6c9cac282986a869
parent 01f5121a33be351c8fa41364020d5e087c5ecc13

Merge "Don't set hidl_string's buffer to nullptr"

automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp

diff --git a/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp b/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
index 311cdef..9146fa1 100644
--- a/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
+++ b/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
@@ -102,10 +102,10 @@
 }
 
 void shallowCopyHidlStr(hidl_string* dest, const hidl_string& src) {
-    if (!src.empty()) {
+    if (src.empty()) {
+        dest->clear();
+    } else {
         dest->setToExternal(src.c_str(), src.size());
-    } else if (dest->size() > 0) {
-        dest->setToExternal(0, 0);
     }
 }