summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/date.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fcb4a451f9..764a6252b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e84eefb173..7ee7d58cae 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