diff --git a/ChangeLog b/ChangeLog
index 7a4eeeb87a..08b23546d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 23:59:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (GlobPathValue): adjust return types.  based on a patch
+	  from Naohisa Goto at [ruby-dev:39350].
+
 Fri Sep 18 23:51:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_object0): entry regexp object before its encoding
diff --git a/dir.c b/dir.c
index 55c1608c5e..293386349e 100644
--- a/dir.c
+++ b/dir.c
@@ -343,7 +343,7 @@ static VALUE dir_close(VALUE);
     /* can contain null bytes as separators */	\
     (!RB_TYPE_P(str, T_STRING) ?		\
      FilePathValue(str) :			\
-     (safe) ? rb_check_safe_obj(str) : (str))
+     (safe) ? (rb_check_safe_obj(str), (str)) : (str))
 
 static VALUE
 dir_s_alloc(VALUE klass)