Skip to content

fix(libkernel): limit UTC-to-local DST output to 32 bits #3855

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
oneandonlydean merged 1 commit into from
Oct 12, 2026
Merged

fix(libkernel): limit UTC-to-local DST output to 32 bits #3855

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: 1 addition & 1 deletion core/libs/prx/libkernel/Time/Time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ int APS5_VABI sceKernelConvertLocaltimeToUtc(int64_t local_time, int64_t reserve
return 0;
}

int APS5_VABI sceKernelConvertUtcToLocaltime(int64_t utc_time, int64_t* local_time, KernelTimesec* st, uint64_t* dst_sec) {
int APS5_VABI sceKernelConvertUtcToLocaltime(int64_t utc_time, int64_t* local_time, KernelTimesec* st, int32_t* dst_sec) {
if (local_time != nullptr) *local_time = utc_time;
if (st != nullptr) *st = {utc_time, 0u, 0u};
if (dst_sec != nullptr) *dst_sec = 0;
Expand Down
14 changes: 10 additions & 4 deletions core/libs/tests/GuestFreebsdClocks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ int APS5_VABI sceKernelUsleep_nid_postfix(KernelUseconds microseconds);
int APS5_VABI gettimeofday_nid_postfix(KernelTimeval* tv, KernelTimezone* tz);
std::int64_t APS5_VABI _Xtime_get_ticks_nid_postfix();
int APS5_VABI sceKernelConvertLocaltimeToUtc(std::int64_t, std::int64_t, std::int64_t*, KernelTimesec*, std::int32_t*);
int APS5_VABI sceKernelConvertUtcToLocaltime(std::int64_t, std::int64_t*, KernelTimesec*, std::uint64_t*);
int APS5_VABI sceKernelConvertUtcToLocaltime(std::int64_t, std::int64_t*, KernelTimesec*, std::int32_t*);
}

static constexpr int SCE_OK = 0;
Expand Down Expand Up @@ -147,6 +147,11 @@ static void CalendarConversionsInitializeTheirState() {
KernelTimesec state;
std::uint64_t after;
};
struct GuardedDst {
std::int32_t seconds;
std::uint32_t after;
};
static_assert(sizeof(GuardedDst) == 8);
for (const auto seconds : std::array<std::int64_t, 4>{-86400, 0, 1767225600, 2147483648}) {
GuardedState local{sentinel, {-1, 0xa5a5a5a5u, 0xa5a5a5a5u}, sentinel};
std::int64_t utc = -1;
Expand All @@ -157,9 +162,10 @@ static void CalendarConversionsInitializeTheirState() {
Require(local.before == sentinel && local.after == sentinel);
GuardedState universal{sentinel, {-1, 0xa5a5a5a5u, 0xa5a5a5a5u}, sentinel};
std::int64_t converted = -1;
std::uint64_t universalDst = sentinel;
Require(sceKernelConvertUtcToLocaltime(utc, &converted, &universal.state, &universalDst) == SCE_OK);
Require(converted == seconds && universalDst == 0);
GuardedDst universalDst{-1, 0xa5a5a5a5u};
Require(sceKernelConvertUtcToLocaltime(utc, &converted, &universal.state, &universalDst.seconds) == SCE_OK);
Require(converted == seconds && universalDst.seconds == 0);
Require(universalDst.after == 0xa5a5a5a5u);
Require(universal.state.t == seconds && universal.state.west_sec == 0 && universal.state.dst_sec == 0);
Require(universal.before == sentinel && universal.after == sentinel);
}
Expand Down
Loading