aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/error/jsonlog.c
diff options
context:
space:
mode:
authorNathan Bossart <nathan@postgresql.org>2024-10-07 13:51:03 -0500
committerNathan Bossart <nathan@postgresql.org>2024-10-07 13:51:03 -0500
commit01731eeeaa9665b47a45b7d2c967ef4c06a56d1b (patch)
tree170d150a9e0502860456f124efa22053c70e5a1a /src/backend/utils/error/jsonlog.c
parent8175a7d11f70589f6b44e28a8dd804f7542d0bbf (diff)
downloadpostgresql-01731eeeaa9665b47a45b7d2c967ef4c06a56d1b.tar.gz
postgresql-01731eeeaa9665b47a45b7d2c967ef4c06a56d1b.zip
Fix Y2038 issues with MyStartTime.
Several places treat MyStartTime as a "long", which is only 32 bits wide on some platforms. In reality, MyStartTime is a pg_time_t, i.e., a signed 64-bit integer. This will lead to interesting bugs on the aforementioned systems in 2038 when signed 32-bit integers are no longer sufficient to store Unix time (e.g., "pg_ctl start" hanging). To fix, ensure that MyStartTime is handled as a 64-bit value everywhere. (Of course, users will need to ensure that time_t is 64 bits wide on their system, too.) Co-authored-by: Max Johnson Discussion: https://postgr.es/m/CO1PR07MB905262E8AC270FAAACED66008D682%40CO1PR07MB9052.namprd07.prod.outlook.com Backpatch-through: 12
Diffstat (limited to 'src/backend/utils/error/jsonlog.c')
-rw-r--r--src/backend/utils/error/jsonlog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c
index 27ad7686d81..fd7e564ed87 100644
--- a/src/backend/utils/error/jsonlog.c
+++ b/src/backend/utils/error/jsonlog.c
@@ -170,8 +170,8 @@ write_jsonlog(ErrorData *edata)
}
/* Session id */
- appendJSONKeyValueFmt(&buf, "session_id", true, "%lx.%x",
- (long) MyStartTime, MyProcPid);
+ appendJSONKeyValueFmt(&buf, "session_id", true, "%" INT64_MODIFIER "x.%x",
+ MyStartTime, MyProcPid);
/* Line number */
appendJSONKeyValueFmt(&buf, "line_num", false, "%ld", log_line_number);