diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-12 16:51:14 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-12 16:51:14 +0000 |
| commit | bb0301dfe66fb8b710ea4d0239aadcbe91ae79af (patch) | |
| tree | 6a03d55c5d258020955e4e615383d2954b015f06 | |
| parent | 28071fdf901f890614f127e54ac2a96f1938a41e (diff) | |
| download | ruby-bb0301dfe66fb8b710ea4d0239aadcbe91ae79af.tar.gz ruby-bb0301dfe66fb8b710ea4d0239aadcbe91ae79af.tar.xz ruby-bb0301dfe66fb8b710ea4d0239aadcbe91ae79af.zip | |
* lib/date.rb (Date::self.complete_hash): need to check if g is
nil before dereference. [ruby-core:09116]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/date.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Oct 13 01:48:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/date.rb (Date::self.complete_hash): need to check if g is + nil before dereference. [ruby-core:09116] + Fri Oct 13 00:34:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (rb_mod_cvar_defined): wrong id check. a patch from diff --git a/lib/date.rb b/lib/date.rb index e84eefb17..7ee7d58ca 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -797,7 +797,7 @@ class Date end end - if g[0] == :time + if g && g[0] == :time if self <= DateTime d ||= Date.today elem[:jd] ||= d.jd |