ruby-changes:25281
From: usa <ko1@a...>
Date: Fri, 26 Oct 2012 14:10:23 +0900 (JST)
Subject: [ruby-changes:25281] usa:r37333 (ruby_1_9_3): merge revision(s) 34374: [Backport #6681]
usa 2012-10-26 14:08:46 +0900 (Fri, 26 Oct 2012) New Revision: 37333 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37333 Log: merge revision(s) 34374: [Backport #6681] * file.c (rmext): no extension to strip if empty string. Modified files: branches/ruby_1_9_3/file.c branches/ruby_1_9_3/version.h Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 37332) +++ ruby_1_9_3/version.h (revision 37333) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 303 +#define RUBY_PATCHLEVEL 304 #define RUBY_RELEASE_DATE "2012-10-26" #define RUBY_RELEASE_YEAR 2012 Index: ruby_1_9_3/file.c =================================================================== --- ruby_1_9_3/file.c (revision 37332) +++ ruby_1_9_3/file.c (revision 37333) @@ -3536,7 +3536,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/