diff options
| author | jkim <jkim@FreeBSD.org> | 2017-11-02 18:22:53 +0000 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-11-13 15:16:55 -0200 |
| commit | 70ee3cb33663d3f5f9666994a129f8053d8ef7b5 (patch) | |
| tree | 622e34c471af49c2ed2b412e8f90a73425e52c21 /crypto/openssl/crypto/o_time.c | |
| parent | 070f0aeb25ca4395acfc08a994071db3318c3c96 (diff) | |
| download | FreeBSD-src-70ee3cb33663d3f5f9666994a129f8053d8ef7b5.zip FreeBSD-src-70ee3cb33663d3f5f9666994a129f8053d8ef7b5.tar.gz | |
MFC: r318899
Merge OpenSSL 1.0.2l.
(cherry picked from commit ffd1bb8c599181e0733f8e00d8d8198b4ea6a73b)
Diffstat (limited to 'crypto/openssl/crypto/o_time.c')
| -rw-r--r-- | crypto/openssl/crypto/o_time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/openssl/crypto/o_time.c b/crypto/openssl/crypto/o_time.c index b99e599..04d805d 100644 --- a/crypto/openssl/crypto/o_time.c +++ b/crypto/openssl/crypto/o_time.c @@ -106,11 +106,8 @@ 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(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); + if (gmtime_r(timer, result) == NULL) + return NULL; ts = result; #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK) ts = gmtime(timer); |
