Skip to content

fix out-of-bound read processing time zone data with distant-past dates #15

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
Ana Pazos (apazos) merged 1 commit into from
Feb 25, 2026
Merged

fix out-of-bound read processing time zone data with distant-past dates #15

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
26 changes: 12 additions & 14 deletions src/time/__tz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,22 +273,20 @@ static size_t scan_trans(long long t, int local, size_t *alt)
n = (index-trans)>>scale;
if (a == n-1) return -1;
if (a == 0) {
x = zi_read32(trans + (a<<scale));
if (scale == 3) x = x<<32 | zi_read32(trans + (a<<scale) + 4);
x = zi_read32(trans);
if (scale == 3) x = x<<32 | zi_read32(trans + 4);
else x = (int32_t)x;
if (local) off = (int32_t)zi_read32(types + 6 * index[a-1]);
/* Find the lowest non-DST type, or 0 if none. */
size_t j = 0;
for (size_t i=abbrevs-types; i; i-=6) {
if (!types[i-6+4]) j = i-6;
}
if (local) off = (int32_t)zi_read32(types + j);
/* If t is before first transition, use the above-found type
* and the index-zero (after transition) type as the alt. */
if (t - off < (int64_t)x) {
for (a=0; a<(abbrevs-types)/6; a++) {
if (types[6*a+4] != types[4]) break;
}
if (a == (abbrevs-types)/6) a = 0;
if (types[6*a+4]) {
*alt = a;
return 0;
} else {
*alt = 0;
return a;
}
if (alt) *alt = index[0];
return j/6;
}
}

Expand Down
26 changes: 12 additions & 14 deletions src/time/aarch64/__tz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,22 +279,20 @@ static size_t scan_trans(long long t, int local, size_t *alt)
n = (index-trans)>>scale;
if (a == n-1) return -1;
if (a == 0) {
x = zi_read32(trans + (a<<scale));
if (scale == 3) x = x<<32 | zi_read32(trans + (a<<scale) + 4);
x = zi_read32(trans);
if (scale == 3) x = x<<32 | zi_read32(trans + 4);
else x = (int32_t)x;
if (local) off = (int32_t)zi_read32(types + 6 * index[a-1]);
/* Find the lowest non-DST type, or 0 if none. */
size_t j = 0;
for (size_t i=abbrevs-types; i; i-=6) {
if (!types[i-6+4]) j = i-6;
}
if (local) off = (int32_t)zi_read32(types + j);
/* If t is before first transition, use the above-found type
* and the index-zero (after transition) type as the alt. */
if (t - off < (int64_t)x) {
for (a=0; a<(abbrevs-types)/6; a++) {
if (types[6*a+4] != types[4]) break;
}
if (a == (abbrevs-types)/6) a = 0;
if (types[6*a+4]) {
*alt = a;
return 0;
} else {
*alt = 0;
return a;
}
if (alt) *alt = index[0];
return j/6;
}
}

Expand Down
Loading