premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

don't dereference empty strings

This commit is contained in:
Arvid Norberg 2010-07-24 06:46:58 +00:00
parent aa1da121bc
commit 030b2b5be8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/libtorrent/utf8.hpp
View File

@ -50,15 +50,15 @@ namespace libtorrent
{ {
// allocate space for worst-case // allocate space for worst-case
wide.resize(utf8.size()); wide.resize(utf8.size());
wchar_t const* dst_start = &wide[0]; wchar_t const* dst_start = wide.c_str();
char const* src_start = &utf8[0]; char const* src_start = utf8.c_str();
ConversionResult ret; ConversionResult ret;
if (sizeof(wchar_t) == sizeof(UTF32)) if (sizeof(wchar_t) == sizeof(UTF32))
{ {
ret = ConvertUTF8toUTF32((const UTF8**)&src_start, (const UTF8*)src_start ret = ConvertUTF8toUTF32((const UTF8**)&src_start, (const UTF8*)src_start
+ utf8.size(), (UTF32**)&dst_start, (UTF32*)dst_start + wide.size() + utf8.size(), (UTF32**)&dst_start, (UTF32*)dst_start + wide.size()
, lenientConversion); , lenientConversion);
wide.resize(dst_start - &wide[0]); wide.resize(dst_start - wide.c_str());
return ret; return ret;
} }
else if (sizeof(wchar_t) == sizeof(UTF16)) else if (sizeof(wchar_t) == sizeof(UTF16))
@ -66,7 +66,7 @@ namespace libtorrent
ret = ConvertUTF8toUTF16((const UTF8**)&src_start, (const UTF8*)src_start ret = ConvertUTF8toUTF16((const UTF8**)&src_start, (const UTF8*)src_start
+ utf8.size(), (UTF16**)&dst_start, (UTF16*)dst_start + wide.size() + utf8.size(), (UTF16**)&dst_start, (UTF16*)dst_start + wide.size()
, lenientConversion); , lenientConversion);
wide.resize(dst_start - &wide[0]); wide.resize(dst_start - wide.c_str());
return ret; return ret;
} }
else else
@ -79,8 +79,9 @@ namespace libtorrent
{ {
// allocate space for worst-case // allocate space for worst-case
utf8.resize(wide.size() * 6); utf8.resize(wide.size() * 6);
if (wide.empty()) return 0;
char* dst_start = &utf8[0]; char* dst_start = &utf8[0];
wchar_t const* src_start = &wide[0]; wchar_t const* src_start = wide.c_str();
ConversionResult ret; ConversionResult ret;
if (sizeof(wchar_t) == sizeof(UTF32)) if (sizeof(wchar_t) == sizeof(UTF32))
{ {