generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug in wstring_convert concerning zero-length inputs. Thanks to Jonathan Coxhead for reporting this bug.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@160136 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2012-07-12 18:07:41 +00:00
parent 591e32d624
commit 1ca23672a0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/locale
View File

@ -3920,7 +3920,8 @@ wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
if (__cvtptr_ != nullptr) if (__cvtptr_ != nullptr)
{ {
wide_string __ws(2*(__frm_end - __frm), _Elem()); wide_string __ws(2*(__frm_end - __frm), _Elem());
__ws.resize(__ws.capacity()); if (__frm != __frm_end)
__ws.resize(__ws.capacity());
codecvt_base::result __r = codecvt_base::ok; codecvt_base::result __r = codecvt_base::ok;
state_type __st = __cvtstate_; state_type __st = __cvtstate_;
if (__frm != __frm_end) if (__frm != __frm_end)
@ -3980,7 +3981,8 @@ wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
if (__cvtptr_ != nullptr) if (__cvtptr_ != nullptr)
{ {
byte_string __bs(2*(__frm_end - __frm), char()); byte_string __bs(2*(__frm_end - __frm), char());
__bs.resize(__bs.capacity()); if (__frm != __frm_end)
__bs.resize(__bs.capacity());
codecvt_base::result __r = codecvt_base::ok; codecvt_base::result __r = codecvt_base::ok;
state_type __st = __cvtstate_; state_type __st = __cvtstate_;
if (__frm != __frm_end) if (__frm != __frm_end)

2
test/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
View File

@ -33,5 +33,7 @@ int main()
assert(ws == L"\x40003"); assert(ws == L"\x40003");
ws = myconv.from_bytes(bs.data(), bs.data() + bs.size()); ws = myconv.from_bytes(bs.data(), bs.data() + bs.size());
assert(ws == L"\x40003"); assert(ws == L"\x40003");
ws = myconv.from_bytes("");
assert(ws.size() == 0);
} }
} }

2
test/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
View File

@ -33,5 +33,7 @@ int main()
assert(bs == "\xF1\x80\x80\x83"); assert(bs == "\xF1\x80\x80\x83");
bs = myconv.to_bytes(ws.data(), ws.data() + ws.size()); bs = myconv.to_bytes(ws.data(), ws.data() + ws.size());
assert(bs == "\xF1\x80\x80\x83"); assert(bs == "\xF1\x80\x80\x83");
bs = myconv.to_bytes(L"");
assert(bs.size() == 0);
} }
} }