diff options
| author | Werner Koch <[email protected]> | 2012-04-30 15:46:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-04-30 15:46:15 +0000 |
| commit | 1a21574b48ee91eedbf95251ee600648b377d1e7 (patch) | |
| tree | a6e4321f5654a13f566957f06b5563457e3d939d /src/conversion.c | |
| parent | Remove trailing white space (diff) | |
| download | gpgme-1a21574b48ee91eedbf95251ee600648b377d1e7.tar.gz gpgme-1a21574b48ee91eedbf95251ee600648b377d1e7.zip | |
Fix timestamp parsing for y2038 hack.
* src/conversion.c (_gpgme_parse_timestamp): Set ENDP before year 2038
check.
Diffstat (limited to 'src/conversion.c')
| -rw-r--r-- | src/conversion.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conversion.c b/src/conversion.c index d585b5ab..356200ce 100644 --- a/src/conversion.c +++ b/src/conversion.c @@ -374,6 +374,9 @@ _gpgme_parse_timestamp (const char *timestamp, char **endp) if (year < 1900) return (time_t)(-1); + if (endp) + *endp = (char*)(timestamp + 15); + /* Fixme: We would better use a configure test to see whether mktime can handle dates beyond 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_sec = atoi_2 (timestamp+13); - if (endp) - *endp = (char*)(timestamp + 15); #ifdef HAVE_W32_SYSTEM return _gpgme_timegm (&buf); #else |