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

diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 8c822f4ef909cec6197406fcfe36a2225cf0565d..9152d5381e30bef3615d21f330dfde8b631cdc12 100644 (file)
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -522,7 +522,7 @@ process_pgfdw_appname(const char *appname)
                appendStringInfoString(&buf, application_name);
                break;
            case 'c':
-               appendStringInfo(&buf, "%lx.%x", (long) (MyStartTime), MyProcPid);
+               appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
                break;
            case 'C':
                appendStringInfoString(&buf, cluster_name);

diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c
index 29c83a7ee4489915921f7f5e4880660b16218df0..99160422f05d6f30cb2ea262a21583862555af7f 100644 (file)
--- a/src/backend/utils/error/csvlog.c
+++ b/src/backend/utils/error/csvlog.c
@@ -122,7 +122,7 @@ write_csvlog(ErrorData *edata)
    appendStringInfoChar(&buf, ',');
 
    /* session id */
-   appendStringInfo(&buf, "%lx.%x", (long) MyStartTime, MyProcPid);
+   appendStringInfo(&buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
    appendStringInfoChar(&buf, ',');
 
    /* Line number */

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 3347f24d4a54a23d4ca917ddcf300852d92347bd..155d8519a74a6c287362965047f12c8d7e3930d3 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2939,12 +2939,12 @@ log_status_format(StringInfo buf, const char *format, ErrorData *edata)
                {
                    char        strfbuf[128];
 
-                   snprintf(strfbuf, sizeof(strfbuf) - 1, "%lx.%x",
-                            (long) (MyStartTime), MyProcPid);
+                   snprintf(strfbuf, sizeof(strfbuf) - 1, "%" INT64_MODIFIER "x.%x",
+                            MyStartTime, MyProcPid);
                    appendStringInfo(buf, "%*s", padding, strfbuf);
                }
                else
-                   appendStringInfo(buf, "%lx.%x", (long) (MyStartTime), MyProcPid);
+                   appendStringInfo(buf, "%" INT64_MODIFIER "x.%x", MyStartTime, MyProcPid);
                break;
            case 'p':
                if (padding != 0)

diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c
index e327774ef79682611b651699cc4d2fc747f693b1..e2fd29b52a4c93ffd088225518054828fdb315ec 100644 (file)
--- 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);

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index b0ca61a8d663bc6dc5a8eafa4061fa8fe6b20bce..4cfeaeb11428d39d9819453ed8445714db0a5203 100644 (file)
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -1383,10 +1383,10 @@ CreateLockFile(const char *filename, bool amPostmaster,
     * both datadir and socket lockfiles; although more stuff may get added to
     * 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),
             DataDir,
-            (long) MyStartTime,
+            MyStartTime,
             PostPortNumber,
             socketDir);
 

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index fc160b0594ce8c60cf1052220671109f48eff0eb..1465b19bfc4f1f949c496a673cad0aba4e15652f 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -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.
             */
            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 &&
 #ifndef WIN32
                pmpid == pm_pid