naruse	2012-07-03 19:39:43 +0900 (Tue, 03 Jul 2012)

  New Revision: 36288

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36288

  Log:
    merge revision(s) 34374:
    
    * file.c (rmext): no extension to strip if empty string.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/file.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36287)
+++ ruby_1_9_3/ChangeLog	(revision 36288)
@@ -1,5 +1,7 @@
-Tue Jul  3 19:18:27 2012  NARUSE, Yui  <naruse@r...>
+Tue Jul  3 19:37:52 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* file.c (rmext): no extension to strip if empty string.
+
 	* proc.c (rb_vm_rewrite_dfp_in_errinfo): Fix `unexpected return'
 	occurs when a proc is called in ensure. [Backport #6460]
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36287)
+++ ruby_1_9_3/version.h	(revision 36288)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 248
+#define RUBY_PATCHLEVEL 249
 
 #define RUBY_RELEASE_DATE "2012-07-03"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 36287)
+++ ruby_1_9_3/file.c	(revision 36288)
@@ -3522,7 +3522,7 @@
     unsigned int c;
     const char *s, *last;
 
-    if (!e) return 0;
+    if (!e || !l2) return 0;
 
     c = rb_enc_codepoint_len(e, e + l2, &len1, enc);
     if (rb_enc_ascget(e + len1, e + l2, &len2, enc) == '*' && len1 + len2 == l2) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/