diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-28 08:35:52 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-28 08:35:52 +0000 |
| commit | ec327c80151a73ceab6f97425aa6146de4e95906 (patch) | |
| tree | 41616dbb2f84a964c02563f1909c2ce368abb77e /time.c | |
| parent | 079a6492108d6282db1a7f307d5a9a19093c26ad (diff) | |
| download | ruby-ec327c80151a73ceab6f97425aa6146de4e95906.tar.gz ruby-ec327c80151a73ceab6f97425aa6146de4e95906.tar.xz ruby-ec327c80151a73ceab6f97425aa6146de4e95906.zip | |
* time.c (make_time_t): verify mktime and timegm result.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
| -rw-r--r-- | time.c | 29 |
1 files changed, 13 insertions, 16 deletions
@@ -826,40 +826,37 @@ make_time_t(struct tm *tptr, int utc_p) buf = *tptr; if (utc_p) { #if defined(HAVE_TIMEGM) - if ((t = timegm(&buf)) != -1) - return t; -#ifdef NEGATIVE_TIME_T + t = timegm(&buf); + if (t == (time_t)-1) +#endif + t = search_time_t(&buf, utc_p); if ((tmp = gmtime(&t)) && tptr->tm_year == tmp->tm_year && tptr->tm_mon == tmp->tm_mon && tptr->tm_mday == tmp->tm_mday && tptr->tm_hour == tmp->tm_hour && tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec - ) + tptr->tm_sec == tmp->tm_sec) { return t; -#endif -#endif - return search_time_t(&buf, utc_p); + } } else { #if defined(HAVE_MKTIME) - if ((t = mktime(&buf)) != -1) - return t; -#ifdef NEGATIVE_TIME_T + t = mktime(&buf); + if (t == (time_t)-1) +#endif + t = search_time_t(&buf, utc_p); if ((tmp = localtime(&t)) && tptr->tm_year == tmp->tm_year && tptr->tm_mon == tmp->tm_mon && tptr->tm_mday == tmp->tm_mday && tptr->tm_hour == tmp->tm_hour && tptr->tm_min == tmp->tm_min && - tptr->tm_sec == tmp->tm_sec - ) + tptr->tm_sec == tmp->tm_sec) { return t; -#endif -#endif - return search_time_t(&buf, utc_p); + } } + rb_raise(rb_eArgError, "couldn't generate a time"); } static VALUE |