Skip to content

Replace strptime with custom implementation #5906

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 6 commits into from
Mar 20, 2019
Merged

Replace strptime with custom implementation #5906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a818610
Replace strptime with custom implementation
TeBoring Mar 17, 2019
7f37f25
Fix ruby strptime
TeBoring Mar 17, 2019
73ef535
Fix test
TeBoring Mar 17, 2019
07197b9
Fix ruby conformance test
TeBoring Mar 17, 2019
f74f023
Use mktime
TeBoring Mar 18, 2019
9786ad5
Remove EmptyFieldMask from failed conformance test list
TeBoring Mar 18, 2019
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
7 changes: 3 additions & 4 deletions php/ext/google/protobuf/upb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14288,7 +14288,7 @@ static void start_timestamp_zone(upb_json_parser *p, const char *ptr) {
static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
size_t len;
const char *buf;
int hours;
int hours = 0;
int64_t seconds;
const char *seconds_membername = "seconds";

Expand All @@ -14308,12 +14308,11 @@ static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
if (buf[0] == '+') {
hours = -hours;
}

p->tm.tm_hour += hours;
}

/* Normalize tm */
seconds = mktime(&p->tm);
seconds = mktime(&p->tm) - timezone;
seconds += 3600 * hours;

/* Check timestamp boundary */
if (seconds < -62135596800) {
Expand Down
2 changes: 1 addition & 1 deletion ruby/ext/google/protobuf_c/upb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14311,7 +14311,7 @@ static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
}

/* Normalize tm */
seconds = timegm(&p->tm);
seconds = mktime(&p->tm) - timezone;
Copy link

@knu knu Apr 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not work on *BSD platforms where timezone is not a long int variable but a function.

Is this change due to timegm() not available everywhere?

seconds += 3600 * hours;

/* Check timestamp boundary */
Expand Down