diff options
| author | nectar <nectar@FreeBSD.org> | 2003-10-01 12:32:41 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-10-01 12:32:41 +0000 |
| commit | ee25ce74b3f6742c1079590363995e56ff51b014 (patch) | |
| tree | 69b3ffc611270d72c473248fe700c2942eb5e6b5 /crypto/openssl/crypto/o_time.c | |
| parent | 5d79b842c13e718f85a9f2e1676e361b6fc55367 (diff) | |
| download | FreeBSD-src-ee25ce74b3f6742c1079590363995e56ff51b014.zip FreeBSD-src-ee25ce74b3f6742c1079590363995e56ff51b014.tar.gz | |
Vendor import of OpenSSL 0.9.7c
Diffstat (limited to 'crypto/openssl/crypto/o_time.c')
| -rw-r--r-- | crypto/openssl/crypto/o_time.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssl/crypto/o_time.c b/crypto/openssl/crypto/o_time.c index ca5f3ea..7854681 100644 --- a/crypto/openssl/crypto/o_time.c +++ b/crypto/openssl/crypto/o_time.c @@ -73,15 +73,17 @@ 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)) && !defined(OPENSSL_SYS_MACOSX) +#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) - memcpy(result, ts, sizeof(struct tm)); + if (ts == NULL) + return NULL; + + memcpy(result, ts, sizeof(struct tm)); ts = result; #endif #ifdef OPENSSL_SYS_VMS |
