From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 31 Jul 2006 22:12:59 +0000 (+0000)
Subject: STABLE14-kreltime-guard-against-null-tm-20060731
X-Git-Tag: openafs-stable-1_4_2b3~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5f7e8c36bf60b5983df019ae9622da8982873d58;p=packages%2Fo%2Fopenafs.git

STABLE14-kreltime-guard-against-null-tm-20060731


so we can memset 0 and get defaults


(cherry picked from commit 67f04fa714580016bdbb707d962ce763023e31aa)
---

diff --git a/src/util/kreltime.c b/src/util/kreltime.c
index 4edb8e9c8..86f080aa4 100644
--- a/src/util/kreltime.c
+++ b/src/util/kreltime.c
@@ -114,10 +114,18 @@ Int32To_ktimeRelDate(afs_int32 int32Date, struct ktime_date *kdptr)
 int
 ktimeDate_FromInt32(afs_int32 timeSecs, struct ktime_date *ktimePtr)
 {
-    struct tm *timePtr;
     time_t     tt = timeSecs;
+    struct tm *timePtr;
+#ifndef AFS_NT40_ENV
+    struct tm timeP;
+
+    timePtr = &timeP;
 
+    memset(&timePtr, 0, sizeof(timePtr));
+    localtime_r(&tt, &timePtr);
+#else
     timePtr = localtime(&tt);
+#endif
 
     /* copy the relevant fields */
     ktimePtr->sec = timePtr->tm_sec;