Fix timestamp parsing for y2038 hack.
* src/conversion.c (_gpgme_parse_timestamp): Set ENDP before year 2038 check.
This commit is contained in:
parent
22de98b7a6
commit
1a21574b48
@ -374,6 +374,9 @@ _gpgme_parse_timestamp (const char *timestamp, char **endp)
|
|||||||
if (year < 1900)
|
if (year < 1900)
|
||||||
return (time_t)(-1);
|
return (time_t)(-1);
|
||||||
|
|
||||||
|
if (endp)
|
||||||
|
*endp = (char*)(timestamp + 15);
|
||||||
|
|
||||||
/* Fixme: We would better use a configure test to see whether
|
/* Fixme: We would better use a configure test to see whether
|
||||||
mktime can handle dates beyond 2038. */
|
mktime can handle dates beyond 2038. */
|
||||||
if (sizeof (time_t) <= 4 && year >= 2038)
|
if (sizeof (time_t) <= 4 && year >= 2038)
|
||||||
@ -387,8 +390,6 @@ _gpgme_parse_timestamp (const char *timestamp, char **endp)
|
|||||||
buf.tm_min = atoi_2 (timestamp+11);
|
buf.tm_min = atoi_2 (timestamp+11);
|
||||||
buf.tm_sec = atoi_2 (timestamp+13);
|
buf.tm_sec = atoi_2 (timestamp+13);
|
||||||
|
|
||||||
if (endp)
|
|
||||||
*endp = (char*)(timestamp + 15);
|
|
||||||
#ifdef HAVE_W32_SYSTEM
|
#ifdef HAVE_W32_SYSTEM
|
||||||
return _gpgme_timegm (&buf);
|
return _gpgme_timegm (&buf);
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user