mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Y2038 issues with MyStartTime.

Browse Source 
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
This commit is contained in:
Nathan Bossart 2024-10-07 13:51:03 -05:00
parent f391d9dc93
commit 5d6187d2a2
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/postgres_fdw/option.c
View File

@ -522,7 +522,7 @@ process_pgfdw_appname(const char *appname)
appendStringInfoString(&buf, application_name); appendStringInfoString(&buf, application_name);
break; break;
case 'c': case 'c':
appendStringInfo(&buf, "%lx.%x", (long) (MyStartTime), MyProcPid); appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
break; break;
case 'C': case 'C':
appendStringInfoString(&buf, cluster_name); appendStringInfoString(&buf, cluster_name);

2
src/backend/utils/error/csvlog.c
View File

@ -120,7 +120,7 @@ write_csvlog(ErrorData *edata)
appendStringInfoChar(&buf, ','); appendStringInfoChar(&buf, ',');
/* session id */ /* session id */
appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid); appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
appendStringInfoChar(&buf, ','); appendStringInfoChar(&buf, ',');
/* Line number */ /* Line number */

6
src/backend/utils/error/elog.c
View File

@ -2944,12 +2944,12 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
{ {
char strfbuf[128]; char strfbuf[128];
snprintf(strfbuf, sizeof(strfbuf) - 1, "%lx.%x", snprintf(strfbuf, sizeof(strfbuf) - 1, "%" INT64_MODIFIER "x.%x",
(long) (MyStartTime), MyProcPid); MyStartTime, MyProcPid);
appendStringInfo(buf, "%*s", padding, strfbuf); appendStringInfo(buf, "%*s", padding, strfbuf);
} }
else else
appendStringInfo(buf, "%lx.%x", (long) (MyStartTime), MyProcPid); appendStringInfo(buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
break; break;
case 'p': case 'p':
if (padding != 0) if (padding != 0)

4
src/backend/utils/error/jsonlog.c
View File

@ -168,8 +168,8 @@ write_jsonlog(ErrorData *edata)
} }
/* Session id */ /* Session id */
appendJSONKeyValueFmt(&buf, "session_id", true, "%lx.%x", appendJSONKeyValueFmt(&buf, "session_id", true, "%" INT64_MODIFIER "x.%x",
(long) MyStartTime, MyProcPid); MyStartTime, MyProcPid);
/* Line number */ /* Line number */
appendJSONKeyValueFmt(&buf, "line_num", false, "%ld", log_line_number); appendJSONKeyValueFmt(&buf, "line_num", false, "%ld", log_line_number);

4
src/backend/utils/init/miscinit.c
View File

@ -1372,10 +1372,10 @@ CreateLockFile(const char *filename, bool amPostmaster,
* both datadir and socket lockfiles; although more stuff may get added to * both datadir and socket lockfiles; although more stuff may get added to
* the datadir lockfile later. * the datadir lockfile later.
*/ */
snprintf(buffer, sizeof(buffer), "%d\n%s\n%ld\n%d\n%s\n", snprintf(buffer, sizeof(buffer), "%d\n%s\n" INT64_FORMAT "\n%d\n%s\n",
amPostmaster ? (int) my_pid : -((int) my_pid), amPostmaster ? (int) my_pid : -((int) my_pid),
DataDir, DataDir,
(long) MyStartTime, MyStartTime,
PostPortNumber, PostPortNumber,
socketDir); socketDir);

2
src/bin/pg_ctl/pg_ctl.c
View File

@ -618,7 +618,7 @@ wait_for_postmaster_start(pid_t pm_pid, bool do_checkpoint)
* Allow 2 seconds slop for possible cross-process clock skew. * Allow 2 seconds slop for possible cross-process clock skew.
*/ */
pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]); pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]);
pmstart = atol(optlines[LOCK_FILE_LINE_START_TIME - 1]); pmstart = atoll(optlines[LOCK_FILE_LINE_START_TIME - 1]);
if (pmstart >= start_time - 2 && if (pmstart >= start_time - 2 &&
#ifndef WIN32 #ifndef WIN32
pmpid == pm_pid pmpid == pm_pid