nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct the logic from f14754fbd for tor_gmtime_r

Browse Source
This commit is contained in:
John Brooks 2011-01-03 21:36:09 -07:00 committed by Nick Mathewson
parent 51e551d383
commit 2dc9546eef
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/compat.c
View File

@ -2112,7 +2112,7 @@ tor_localtime_r(const time_t *timep, struct tm *result)
* Convert *<b>timep</b> to a struct tm in UTC, and store the value in * Convert *<b>timep</b> to a struct tm in UTC, and store the value in
* *<b>result</b>. Return the result on success, or NULL on failure. * *<b>result</b>. Return the result on success, or NULL on failure.
*/ */
#ifndef HAVE_GMTIME_R #ifdef HAVE_GMTIME_R
struct tm * struct tm *
tor_gmtime_r(const time_t *timep, struct tm *result) tor_gmtime_r(const time_t *timep, struct tm *result)
{ {
@ -2130,7 +2130,8 @@ tor_gmtime_r(const time_t *timep, struct tm *result)
tor_assert(result); tor_assert(result);
tor_mutex_acquire(m); tor_mutex_acquire(m);
r = gmtime(timep); r = gmtime(timep);
memcpy(result, r, sizeof(struct tm)); if (r)
memcpy(result, r, sizeof(struct tm));
tor_mutex_release(m); tor_mutex_release(m);
return correct_tm(0, timep, result, r); return correct_tm(0, timep, result, r);
} }
@ -2141,7 +2142,8 @@ tor_gmtime_r(const time_t *timep, struct tm *result)
struct tm *r; struct tm *r;
tor_assert(result); tor_assert(result);
r = gmtime(timep); r = gmtime(timep);
memcpy(result, r, sizeof(struct tm)); if (r)
memcpy(result, r, sizeof(struct tm));
return correct_tm(0, timep, result, r); return correct_tm(0, timep, result, r);
} }
#endif #endif