1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* time.c (rb_localtime_r2): get rid of infinite loop bug of

Browse Source 
localtime() on x86_64-darwin.  [ruby-core:30031]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-05-06 08:16:45 +00:00
parent 4bada8b864
commit fadc3a8bbc
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu May 6 17:16:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* time.c (rb_localtime_r2): get rid of infinite loop bug of
localtime() on x86_64-darwin. [ruby-core:30031]
Thu May 6 15:56:12 2010 Aaron Patterson <aaron@tenderlovemaking.com> Thu May 6 15:56:12 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/fiddle/*: Adding fiddle library to wrap libffi * ext/fiddle/*: Adding fiddle library to wrap libffi

3
time.c
View File

@ -863,6 +863,9 @@ rb_localtime_r(const time_t *tp, struct tm *result)
static struct tm * static struct tm *
rb_localtime_r2(const time_t *t, struct tm *result) rb_localtime_r2(const time_t *t, struct tm *result)
{ {
#if defined __APPLE__ && defined __LP64__
if (*t != (time_t)(int)*t) return NULL;
#endif
result = rb_localtime_r(t, result); result = rb_localtime_r(t, result);
#if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM) #if defined(HAVE_MKTIME) && defined(LOCALTIME_OVERFLOW_PROBLEM)
if (result) { if (result) {