diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 15:50:54 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 15:50:54 +0000 |
| commit | 4ecb02349f492c11d9a00493c2a36644ac65eaab (patch) | |
| tree | 57bcfc6efa43b2c0f15e950ee8ff4e6287abc8a3 /mojo/common | |
| parent | cbcd1b95ffe2528d08c183517e787d0e81e9a6b2 (diff) | |
| download | chromium_src-4ecb02349f492c11d9a00493c2a36644ac65eaab.zip chromium_src-4ecb02349f492c11d9a00493c2a36644ac65eaab.tar.gz chromium_src-4ecb02349f492c11d9a00493c2a36644ac65eaab.tar.bz2 | |
Fixes bug in empty string conversion for string16
BUG=none
TEST=covered by test.
R=darin@chromium.org
Review URL: https://codereview.chromium.org/213413008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/common')
| -rw-r--r-- | mojo/common/common_type_converters.cc | 2 | ||||
| -rw-r--r-- | mojo/common/common_type_converters_unittest.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mojo/common/common_type_converters.cc b/mojo/common/common_type_converters.cc index b207e1e..3aa0e94 100644 --- a/mojo/common/common_type_converters.cc +++ b/mojo/common/common_type_converters.cc @@ -14,6 +14,8 @@ namespace mojo { String TypeConverter<String, base::StringPiece>::ConvertFrom( const base::StringPiece& input, Buffer* buf) { + if (input.empty()) + return String(); String::Builder result(input.size(), buf); memcpy(&result[0], input.data(), input.size()); return result.Finish(); diff --git a/mojo/common/common_type_converters_unittest.cc b/mojo/common/common_type_converters_unittest.cc index 5e825c0..1f3894c 100644 --- a/mojo/common/common_type_converters_unittest.cc +++ b/mojo/common/common_type_converters_unittest.cc @@ -67,6 +67,9 @@ TEST(CommonTypeConvertersTest, String16) { // Test implicit construction and conversion: ExpectEqualsMojoString(string16, string16); ExpectEqualsString16(string16, mojo_string); + + // Test empty string conversion. + ExpectEqualsMojoString(base::string16(), base::string16()); } } // namespace test |