X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fo_time.c;h=785468131e10f225305feb382643561363b80807;hp=86b78e39e917a9145ddb6911adf550f13db00e17;hb=ec5d8a54e9ea80599bf67a7c9349b49d430dde62;hpb=5cd6571fae7155eb9bb564fe3ee646795b7f32c1

diff --git a/crypto/o_time.c b/crypto/o_time.c
index 86b78e39e9..785468131e 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -73,13 +73,16 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
 	{
 	struct tm *ts = NULL;
 
-#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_OS2) && !defined(__CYGWIN32__) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r))
+#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_OS2) && !defined(__CYGWIN32__) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r)) && !defined(OPENSSL_SYS_MACOSX) && !defined(OPENSSL_SYS_SUNOS)
 	/* should return &data, but doesn't on some systems,
 	   so we don't even look at the return value */
 	gmtime_r(timer,result);
 	ts = result;
 #elif !defined(OPENSSL_SYS_VMS)
 	ts = gmtime(timer);
+	if (ts == NULL)
+		return NULL;
+
 	memcpy(result, ts, sizeof(struct tm));
 	ts = result;
 #endif