Skip to content

[libc++] Fix num_get base parsing #170460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2025
+98 −0
Merged

[libc++] Fix num_get base parsing #170460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libcxx/include/__locale_dir/num.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ class num_get : public locale::facet, private __num_get<_CharT> {
++__first;
if (__first == __last) {
__err |= ios_base::eofbit;
__v = 0;
return __first;
}
// __c2 == 'x' || __c2 == 'X'
Expand All @@ -444,6 +445,7 @@ class num_get : public locale::facet, private __num_get<_CharT> {
++__first;
} else {
__base = 8;
__parsed_num = true; // We only swallowed '0', so we've started to parse a number
}
} else {
__base = 10;
Expand Down
96 changes: 96 additions & 0 deletions ...locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,5 +670,101 @@ int main(int, char**)
assert(v == std::numeric_limits<long>::min());
}

{ // Check that auto-detection of the base works properly
ios.flags(ios.flags() & ~std::ios::basefield);
{ // zeroes
{
v = -1;
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 1), ios, err, v);
assert(base(iter) == str + 1);
assert(err == ios.eofbit);
assert(v == 0);
}
{
v = -1;
const char str[] = "00";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 2), ios, err, v);
assert(base(iter) == str + 2);
assert(err == ios.eofbit);
assert(v == 0);
}
{
v = -1;
const char str[] = "0x0";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 3), ios, err, v);
assert(base(iter) == str + 3);
assert(err == ios.eofbit);
assert(v == 0);
}
{
v = -1;
const char str[] = "0X0";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 3), ios, err, v);
assert(base(iter) == str + 3);
assert(err == ios.eofbit);
assert(v == 0);
}
}
{ // first character after base is out of range
{
v = -1;
const char str[] = "08";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 2), ios, err, v);
assert(base(iter) == str + 1);
assert(err == ios.goodbit);
assert(v == 0);
}
{
v = -1;
const char str[] = "1a";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 2), ios, err, v);
assert(base(iter) == str + 1);
assert(err == ios.goodbit);
assert(v == 1);
}
{
v = -1;
const char str[] = "0xg";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 3), ios, err, v);
assert(base(iter) == str + 2);
assert(err == ios.failbit);
assert(v == 0);
}
{
v = -1;
const char str[] = "0Xg";
std::ios_base::iostate err = ios.goodbit;

cpp17_input_iterator<const char*> iter =
f.get(cpp17_input_iterator<const char*>(str), cpp17_input_iterator<const char*>(str + 3), ios, err, v);
assert(base(iter) == str + 2);
assert(err == ios.failbit);
assert(v == 0);
}
}
}

return 0;
}
Loading