boostorg/conversion
1
0
Fork 1
mirror of https://github.com/boostorg/conversion.git synced 2025-08-03 22:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6298

Browse Source 
Fixes #6264

[SVN r76096]
This commit is contained in:
Antony Polukhin
2011-12-21 17:03:52 +00:00
parent 8627f8bb8a
commit 5d288580ee
2 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/lexical_cast.hpp
View File

@@ -586,7 +586,7 @@ namespace boost
--end; --end;
value = 0; value = 0;
if ( *end < czero || *end >= czero + 10 || begin > end) if (begin > end || *end < czero || *end >= czero + 10)
return false; return false;
value = *end - czero; value = *end - czero;
--end; --end;
@@ -684,6 +684,7 @@ namespace boost
, const CharT opening_brace, const CharT closing_brace) , const CharT opening_brace, const CharT closing_brace)
{ {
using namespace std; using namespace std;
if (begin == end) return false;
const CharT minus = lcast_char_constants<CharT>::minus; const CharT minus = lcast_char_constants<CharT>::minus;
const CharT plus = lcast_char_constants<CharT>::plus; const CharT plus = lcast_char_constants<CharT>::plus;
const int inifinity_size = 8; const int inifinity_size = 8;
@@ -1183,7 +1184,7 @@ namespace boost
bool const result = !(stream << input).fail(); bool const result = !(stream << input).fail();
start = stringbuffer.pbase(); start = stringbuffer.pbase();
finish = stringbuffer.pptr(); finish = stringbuffer.pptr();
return result && (start != finish); return result;
} }
template <class T> template <class T>
@@ -1358,6 +1359,7 @@ namespace boost
template <typename Type> template <typename Type>
bool shr_unsigned(Type& output) bool shr_unsigned(Type& output)
{ {
if (start == finish) return false;
CharT const minus = lcast_char_constants<CharT>::minus; CharT const minus = lcast_char_constants<CharT>::minus;
CharT const plus = lcast_char_constants<CharT>::plus; CharT const plus = lcast_char_constants<CharT>::plus;
bool has_minus = false; bool has_minus = false;
@@ -1392,6 +1394,7 @@ namespace boost
template <typename Type> template <typename Type>
bool shr_signed(Type& output) bool shr_signed(Type& output)
{ {
if (start == finish) return false;
CharT const minus = lcast_char_constants<CharT>::minus; CharT const minus = lcast_char_constants<CharT>::minus;
CharT const plus = lcast_char_constants<CharT>::plus; CharT const plus = lcast_char_constants<CharT>::plus;
typedef BOOST_DEDUCED_TYPENAME make_unsigned<Type>::type utype; typedef BOOST_DEDUCED_TYPENAME make_unsigned<Type>::type utype;

81
test/lexical_cast_empty_input_test.cpp
View File

@@ -24,27 +24,86 @@ using namespace boost;
void test_empty_iterator_range() void test_empty_iterator_range()
{ {
boost::iterator_range<const char*> v; boost::iterator_range<const char*> v;
BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<std::string>(v), bad_lexical_cast); BOOST_CHECK_EQUAL(lexical_cast<std::string>(v), std::string());
BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<char>(v), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<signed char>(v), bad_lexical_cast);
} }
void test_empty_string() void test_empty_string()
{ {
BOOST_CHECK_THROW(lexical_cast<int>(std::string()), bad_lexical_cast); std::string v;
BOOST_CHECK_THROW(lexical_cast<float>(std::string()), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<double>(std::string()), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<long double>(std::string()), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned int>(std::string()), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
BOOST_CHECK_EQUAL(lexical_cast<std::string>(std::string()), std::string()); BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned short>(std::string()), bad_lexical_cast); BOOST_CHECK_EQUAL(lexical_cast<std::string>(v), std::string());
BOOST_CHECK_THROW(lexical_cast<char>(std::string()), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<signed char>(v), bad_lexical_cast);
}
struct Escape
{
Escape(const std::string& s)
: str_(s)
{}
std::string str_;
};
inline std::ostream& operator<< (std::ostream& o, const Escape& rhs)
{
return o << rhs.str_;
}
void test_empty_user_class()
{
Escape v("");
BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
BOOST_CHECK_EQUAL(lexical_cast<std::string>(v), std::string());
BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<signed char>(v), bad_lexical_cast);
}
namespace std {
inline std::ostream & operator<<(std::ostream & out, const std::vector<long> & v)
{
std::ostream_iterator<long> it(out);
std::copy(v.begin(), v.end(), it);
assert(out);
return out;
}
}
void test_empty_vector()
{
std::vector<long> v;
BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
BOOST_CHECK_EQUAL(lexical_cast<std::string>(v), std::string());
BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<unsigned char>(v), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<signed char>(v), bad_lexical_cast);
} }
unit_test::test_suite *init_unit_test_suite(int, char *[]) unit_test::test_suite *init_unit_test_suite(int, char *[])
@@ -53,6 +112,8 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])
BOOST_TEST_SUITE("lexical_cast. Empty input unit test"); BOOST_TEST_SUITE("lexical_cast. Empty input unit test");
suite->add(BOOST_TEST_CASE(&test_empty_iterator_range)); suite->add(BOOST_TEST_CASE(&test_empty_iterator_range));
suite->add(BOOST_TEST_CASE(&test_empty_string)); suite->add(BOOST_TEST_CASE(&test_empty_string));
suite->add(BOOST_TEST_CASE(&test_empty_user_class));
suite->add(BOOST_TEST_CASE(&test_empty_vector));
return suite; return suite;
} }