[前][次][番号順一覧][スレッド一覧]

ruby-changes:22325

From: nobu <ko1@a...>
Date: Wed, 25 Jan 2012 11:40:41 +0900 (JST)
Subject: [ruby-changes:22325] nobu:r34374 (trunk): * file.c (rmext): no extension to strip if empty string.

nobu	2012-01-25 11:40:29 +0900 (Wed, 25 Jan 2012)

  New Revision: 34374

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

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

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34373)
+++ ChangeLog	(revision 34374)
@@ -1,5 +1,7 @@
-Wed Jan 25 11:32:03 2012  Nobuyoshi Nakada  <nobu@r...>
+Wed Jan 25 11:40:26 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* file.c (rmext): no extension to strip if empty string.
+
 	* file.c (rb_enc_path_next, rb_enc_path_skip_prefix)
 	  (rb_enc_path_last_separator, rb_enc_path_end)
 	  (ruby_enc_find_basename, ruby_enc_find_extname): encoding-aware
Index: file.c
===================================================================
--- file.c	(revision 34373)
+++ file.c	(revision 34374)
@@ -3535,7 +3535,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/

[前][次][番号順一覧][スレッド一覧]