boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-02-22 15:42:30 +00:00
Code Issues Projects Releases Wiki Activity

Fixed problems with new wchar/mbchar conversion

Browse Source 
bumped archive version number
This commit is contained in:
Robert Ramey
2015-10-02 15:03:02 -07:00
parent 4d9fccbee5
commit 40f6cfcc84
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/boost/archive/impl/xml_iarchive_impl.ipp
View File

@@ -66,22 +66,21 @@ xml_iarchive_impl<Archive>::load(std::wstring &ws){
#endif
ws.resize(0);
std::mbstate_t mbs;
std::mbrtowc(0, 0, 0, &mbs);
const char * start = s.data();
const char * end = start + s.size();
while(start < end){
wchar_t wc;
int resultx = std::mbrtowc(&wc, start, end - start, &mbs);
if(0 < resultx){
start += resultx;
ws += wc;
std::size_t result = std::mbrtowc(&wc, start, end - start, &mbs);
if(result == static_cast<std::size_t>(-1))
boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
);
if(result == static_cast<std::size_t>(-2))
continue;
}
boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
);
start += result;
ws += wc;
}
}
#endif // BOOST_NO_STD_WSTRING
@@ -94,26 +93,28 @@ xml_iarchive_impl<Archive>::load(wchar_t * ws){
bool result = gimpl->parse_string(is, s);
if(! result)
boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
xml_archive_exception(
xml_archive_exception::xml_archive_parsing_error
)
);
std::mbstate_t mbs;
std::mbrtowc(0, 0, 0, &mbs);
const char * start = s.data();
const char * end = start + s.size();
while(start < end){
wchar_t wc;
int length = std::mbrtowc(&wc, start, end - start, &mbs);
if(0 < length){
start += length;
*ws++ = wc;
std::size_t length = std::mbrtowc(&wc, start, end - start, &mbs);
if(static_cast<std::size_t>(-1) == length)
boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
);
if(static_cast<std::size_t>(-2) == length)
continue;
}
boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
);
start += length;
*ws++ = wc;
}
*ws = L'\0';
}

8
include/boost/archive/iterators/wchar_from_mb.hpp
View File

@@ -102,18 +102,16 @@ public:
template<class Base>
wchar_t wchar_from_mb<Base>::drain(){
std::mbstate_t mbs;
std::mbrtowc(0, 0, 0, &mbs);
wchar_t retval;
int result;
std::size_t result;
do {
char val = *this->base_reference();
result = std::mbrtowc(&retval, &val, 1, &mbs);
if(result == -1)
if(result == static_cast<std::size_t>(-1))
boost::serialization::throw_exception(iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
));
++(this->base_reference());
} while (result == -2);
} while (result == static_cast<std::size_t>(-2));
return retval;
}