From d947750eb067f092c90122366a1ee57d2c8fc808 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 12 Oct 2006 16:51:14 +0000 Subject: [PATCH] * lib/date.rb (Date::self.complete_hash): need to check if g is nil before dereference. [ruby-core:09116] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/date.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eded2eca5a..36a0332c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 13 01:48:42 2006 Yukihiro Matsumoto + + * lib/date.rb (Date::self.complete_hash): need to check if g is + nil before dereference. [ruby-core:09116] + Fri Oct 13 01:05:58 2006 Yukihiro Matsumoto * string.c (rb_str_partition): RDoc update. a patch from diff --git a/lib/date.rb b/lib/date.rb index dcc673bed7..1c9901534a 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