merge revision(s) 34374: [Backport #6681]

	* file.c (rmext): no extension to strip if empty string.


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

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index 11e8cf72f8..b8f718297c 100644
--- a/file.c
+++ b/file.c
@@ -3536,7 +3536,7 @@ rmext(const char *p, long l0, long l1, const char *e, long l2, rb_encoding *enc)
     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) {