Skip to content

cast char to unsigned char before ctype calls in cctz parser #2099

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

Closed
nabhan06 wants to merge 1 commit into from
+13 −10
Closed

cast char to unsigned char before ctype calls in cctz parser #2099

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
23 changes: 13 additions & 10 deletions absl/time/internal/cctz/src/time_zone_format.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ std::string format(const std::string& format, const time_point<seconds>& tp,
bp = Format64(ep, 4, al.cs.year());
result.append(bp, ep);
pending = cur += 2;
} else if (std::isdigit(*cur)) {
} else if (std::isdigit(static_cast<unsigned char>(*cur))) {
// Possibly found %E#S or %E#f.
int n = 0;
if (const char* np = ParseInt(cur, 0, 0, 1024, &n)) {
Expand Down Expand Up @@ -620,7 +620,8 @@ const char* ParseOffset(const char* dp, const char* mode, int* offset) {
const char* ParseZone(const char* dp, std::string* zone) {
zone->clear();
if (dp != nullptr) {
while (*dp != '\0' && !std::isspace(*dp)) zone->push_back(*dp++);
while (*dp != '\0' && !std::isspace(static_cast<unsigned char>(*dp)))
zone->push_back(*dp++);
if (zone->empty()) dp = nullptr;
}
return dp;
Expand Down Expand Up @@ -706,7 +707,7 @@ bool parse(const std::string& format, const std::string& input,
const char* const edata = data + input.size();

// Skips leading whitespace.
while (std::isspace(*data)) ++data;
while (std::isspace(static_cast<unsigned char>(*data))) ++data;

const year_t kyearmax = std::numeric_limits<year_t>::max();
const year_t kyearmin = std::numeric_limits<year_t>::min();
Expand Down Expand Up @@ -744,9 +745,9 @@ bool parse(const std::string& format, const std::string& input,

// Steps through format, one specifier at a time.
while (data != nullptr && fmt != efmt) {
if (std::isspace(*fmt)) {
while (std::isspace(*data)) ++data;
while (std::isspace(*++fmt)) continue;
if (std::isspace(static_cast<unsigned char>(*fmt))) {
while (std::isspace(static_cast<unsigned char>(*data))) ++data;
while (std::isspace(static_cast<unsigned char>(*++fmt))) continue;
continue;
}

Expand Down Expand Up @@ -898,7 +899,8 @@ bool parse(const std::string& format, const std::string& input,
continue;
}
if (fmt[0] == '*' && fmt[1] == 'f') {
if (data != nullptr && std::isdigit(*data)) {
if (data != nullptr &&
std::isdigit(static_cast<unsigned char>(*data))) {
data = ParseSubSeconds(data, &subseconds);
}
fmt += 2;
Expand All @@ -917,7 +919,7 @@ bool parse(const std::string& format, const std::string& input,
fmt += 2;
continue;
}
if (std::isdigit(*fmt)) {
if (std::isdigit(static_cast<unsigned char>(*fmt))) {
int n = 0; // value ignored
if (const char* np = ParseInt(fmt, 0, 0, 1024, &n)) {
if (*np == 'S') {
Expand All @@ -929,7 +931,8 @@ bool parse(const std::string& format, const std::string& input,
continue;
}
if (*np == 'f') {
if (data != nullptr && std::isdigit(*data)) {
if (data != nullptr &&
std::isdigit(static_cast<unsigned char>(*data))) {
data = ParseSubSeconds(data, &subseconds);
}
fmt = ++np;
Expand Down Expand Up @@ -977,7 +980,7 @@ bool parse(const std::string& format, const std::string& input,
}

// Skip any remaining whitespace.
while (std::isspace(*data)) ++data;
while (std::isspace(static_cast<unsigned char>(*data))) ++data;

// parse() must consume the entire input string.
if (data != edata) {
Expand Down