From: Guido Vranken <guidovranken@gmail.com>
Date: Sat, 11 Feb 2017 21:41:38 +0000 (+0100)
Subject: Remove obsolete comment
X-Git-Tag: OpenSSL_1_0_2l~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b70dc3a66d168b0f136a6edf50239df6e13abdac;p=oweals%2Fopenssl.git

Remove obsolete comment

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1613)
(cherry picked from commit 7c120357e5ef434c8a7d1d1c3ba4f2a33266374e)
---

diff --git a/crypto/o_time.c b/crypto/o_time.c
index b99e5990b4..04d805d9a9 100755
--- a/crypto/o_time.c
+++ b/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);