commit 20eb9dd1c220ceb5763dc5322c69921a2671cb37
author Steven Moreland <smoreland@google.com> Tue Feb 28 19:38:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 28 19:38:58 2017 +0000
tree 97ae917203d7df632dec86b70583d2eea45d78d5
parent 40318d963db442ac5c2b125ec815180da65f2c2c
parent b41903097556d7f6dfa517c817cc544ab300772d

Merge "Make operator= and constructor behavior consistent." am: ecfdacd86c am: 7e7e4a3860
am: b419030975

Change-Id: I7944ded56032b4e65aabb407349a54fe1450fdc1

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 0612050..7add055 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -240,6 +240,11 @@
 
 hidl_string &hidl_string::operator=(const char *s) {
     clear();
+
+    if (s == nullptr) {
+        return *this;
+    }
+
     copyFrom(s, strlen(s));
     return *this;
 }

test_main.cpp

diff --git a/test_main.cpp b/test_main.cpp
index 6bd7f83..4f59371 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -61,6 +61,8 @@
     EXPECT_STREQ(s2.c_str(), "s2");
     hidl_string s2a(nullptr); // copy constructor from null cstr
     EXPECT_STREQ("", s2a);
+    s2a = nullptr; // = from nullptr cstr
+    EXPECT_STREQ(s2a.c_str(), "");
     hidl_string s3 = hidl_string("s3"); // move =
     EXPECT_STREQ(s3.c_str(), "s3");
     hidl_string s4 = hidl_string("12345", 3); // copy constructor from cstr w/ length