From: Tom Lane Date: Sat, 15 Feb 2014 22:09:54 +0000 (-0500) Subject: Fix unportable coding in DetermineSleepTime(). X-Git-Tag: REL9_3_3~15 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=dada4747a0eefc57cf82a27d856562b029813464;p=postgresql.git Fix unportable coding in DetermineSleepTime(). We should not assume that struct timeval.tv_sec is a long, because it ain't necessarily. (POSIX says that it's a time_t, which might well be 64 bits now or in the future; or for that matter might be 32 bits on machines with 64-bit longs.) Per buildfarm member panther. Back-patch to 9.3 where the dubious coding was introduced. --- diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 18a68f80db7..bcd37869067 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1478,10 +1478,12 @@ DetermineSleepTime(struct timeval * timeout) if (next_wakeup != 0) { + long secs; int microsecs; TimestampDifference(GetCurrentTimestamp(), next_wakeup, - &timeout->tv_sec, µsecs); + &secs, µsecs); + timeout->tv_sec = secs; timeout->tv_usec = microsecs; /* Ensure we don't exceed one minute */