diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-02-01 21:59:27 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-02-01 21:59:27 +0000 |
| commit | 5d83dada720360f613bac9f3073580191c35a379 (patch) | |
| tree | a55aebc48a198c39837c3392259aef0256404b24 | |
| parent | a5fae5335e312a9bfea81a58f8ac9f9cadcb09c3 (diff) | |
| download | libcxx-5d83dada720360f613bac9f3073580191c35a379.tar.gz | |
add a test and a couple minor bug fixes for the implicit-signed-integer-truncation sanitizer. This is PR#40566
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@352926 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/locale | 2 | ||||
| -rw-r--r-- | include/sstream | 2 | ||||
| -rw-r--r-- | test/std/input.output/string.streams/stringstream.members/str.pass.cpp | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/locale b/include/locale index f16d4ba1f..c3c05eb39 100644 --- a/include/locale +++ b/include/locale @@ -546,7 +546,7 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex __exp = 'P'; else if ((__x & 0x5F) == __exp) { - __exp |= 0x80; + __exp |= (char) 0x80; if (__in_units) { __in_units = false; diff --git a/include/sstream b/include/sstream index 71204e0fa..14c91971c 100644 --- a/include/sstream +++ b/include/sstream @@ -558,7 +558,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c) char_type* __p = const_cast<char_type*>(__str_.data()); this->setg(__p, __p + __ninp, __hm_); } - return this->sputc(__c); + return this->sputc(traits_type::to_char_type(__c)); } return traits_type::not_eof(__c); } diff --git a/test/std/input.output/string.streams/stringstream.members/str.pass.cpp b/test/std/input.output/string.streams/stringstream.members/str.pass.cpp index b8fa28ddb..392a1680e 100644 --- a/test/std/input.output/string.streams/stringstream.members/str.pass.cpp +++ b/test/std/input.output/string.streams/stringstream.members/str.pass.cpp @@ -58,4 +58,9 @@ int main() ss << i << ' ' << 321; assert(ss.str() == L"89 3219 "); } + { + std::stringstream ss; + ss.write("\xd1", 1); + assert(ss.str().length() == 1); + } } |