mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	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
This commit is contained in:
		@@ -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 */
 | 
			
		||||
 
 | 
			
		||||
@@ -2596,12 +2596,12 @@ log_line_prefix(StringInfo buf, 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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user