The branch master has been updated
via 7c120357e5ef434c8a7d1d1c3ba4f2a33266374e (commit)
via 873019f2c3d5d19f761b0f6e8dbc8d439345fd6f (commit)
from 57b0d651f052ed86528da916397acbcce035fb21 (commit)
- Log -----------------------------------------------------------------
commit 7c120357e5ef434c8a7d1d1c3ba4f2a33266374e
Author: Guido Vranken <[email protected]>
Date: Sat Feb 11 22:41:38 2017 +0100
Remove obsolete comment
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1613)
commit 873019f2c3d5d19f761b0f6e8dbc8d439345fd6f
Author: Guido Vranken <[email protected]>
Date: Thu Sep 22 22:48:44 2016 +0200
Prevents that OPENSSL_gmtime incorrectly signals success if gmtime_r fails,
and that struct* tm result's possibly uninitialized content is used
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1613)
-----------------------------------------------------------------------
Summary of changes:
crypto/o_time.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/crypto/o_time.c b/crypto/o_time.c
index e785525..4b902e0 100755
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -52,11 +52,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_VMS) || defined(gmtime_r)) && !defined(OPENSSL_SYS_MACOSX)
- /*
- * 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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
