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

Do not parse sign if a sign is not the next legal character when parsing floating point from an input stream. Fixes http://llvm.org/bugs/show_bug.cgi?id=11871

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@150609 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2012-02-15 19:19:37 +00:00
parent d7a2ad6a99
commit b04ad4162d
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/locale
View File

@ -665,6 +665,15 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex
if (__f >= 32) if (__f >= 32)
return -1; return -1;
char __x = __src[__f]; char __x = __src[__f];
if (__x == '-' || __x == '+')
{
if (__a_end == __a || (__a_end[-1] & 0xDF) == __exp)
{
*__a_end++ = __x;
return 0;
}
return -1;
}
if (__a_end-__a < __num_get_buf_sz - 1) if (__a_end-__a < __num_get_buf_sz - 1)
*__a_end++ = __x; *__a_end++ = __x;
if (__x == 'x' || __x == 'X') if (__x == 'x' || __x == 'X')

12
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
View File

@ -192,6 +192,18 @@ int main()
assert(err == ios.goodbit); assert(err == ios.goodbit);
assert(v == 123); assert(v == 123);
} }
{
v = -1;
const char str[] = "2-";
std::ios_base::iostate err = ios.goodbit;
input_iterator<const char*> iter =
f.get(input_iterator<const char*>(str),
input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
assert(v == 2);
}
ios.imbue(std::locale(std::locale(), new my_numpunct)); ios.imbue(std::locale(std::locale(), new my_numpunct));
{ {
v = -1; v = -1;

12
test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
View File

@ -144,6 +144,18 @@ int main()
assert(err == ios.goodbit); assert(err == ios.goodbit);
assert(v == 83); assert(v == 83);
} }
{
const char str[] = "2-";
ios.setf(0, ios.basefield);
std::ios_base::iostate err = ios.goodbit;
input_iterator<const char*> iter =
f.get(input_iterator<const char*>(str),
input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
assert(v == 2);
}
dec(ios); dec(ios);
ios.imbue(std::locale(std::locale(), new my_numpunct)); ios.imbue(std::locale(std::locale(), new my_numpunct));
{ {