merge 0.9.7b with local changes; crank majors for libssl/libcrypto

1 files changed, 3 insertions, 0 deletions

diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index 1bc0297b36..723eb1b5af 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -80,6 +80,9 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *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