* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION

  and Marshal::MINOR_VERSION.

* marshal.c (marshal_load): ruby_verbose test should be wrapped by
  RTEST().

* hash.c (rb_hash_index): should return nil (not the default
  value) if value is not in the hash.

* numeric.c (num_div): new method added.  alias to '/' which
  should be preserved even if '/' is redefined (e.g. by
  mathn). [new]

* bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255.

* file.c (rb_file_s_expand_path): fixed using CharNext().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/file.c b/file.c
index 76076e47a2..2241efa19d 100644
--- a/file.c
+++ b/file.c
@@ -1438,6 +1438,12 @@ rb_file_s_expand_path(argc, argv)
 			}
 			b = ++s;
 		    }
+		    else {
+			p = CharNext(p);
+			*p++ = '.';
+			*p = '.';
+			if (p >= bend) goto toolong;
+		    }
 		    break;
 		  case '/':
 #if defined DOSISH