akr	2007-12-25 18:07:32 +0900 (Tue, 25 Dec 2007)

  New Revision: 14687

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/string.c

  Log:
    * string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
      string.  fix '#'.inspect.
    
    * encoding.c (rb_enc_codepoint): raise on empty string.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14687&r2=14686
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14687&r2=14686
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14687&r2=14686

Index: encoding.c
===================================================================
--- encoding.c	(revision 14686)
+++ encoding.c	(revision 14687)
@@ -662,7 +662,10 @@
 
 int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
 {
-    int r = rb_enc_precise_mbclen(p, e, enc);
+    int r;
+    if (e <= p)
+        rb_raise(rb_eArgError, "empty string");
+    r = rb_enc_precise_mbclen(p, e, enc);
     if (MBCLEN_CHARFOUND(r))
         return ONIGENC_MBC_TO_CODE(enc,(UChar*)p,(UChar*)e);
     else
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14686)
+++ ChangeLog	(revision 14687)
@@ -1,3 +1,10 @@
+Tue Dec 25 18:06:04 2007  Tanaka Akira  <akr@f...>
+	
+	* string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
+	  string.  fix '#'.inspect.
+
+	* encoding.c (rb_enc_codepoint): raise on empty string.
+
 Tue Dec 25 17:48:28 2007  Shugo Maeda  <shugo@r...>
 
 	* vm.c (rb_frame_method_id_and_class): new function to get the
Index: string.c
===================================================================
--- string.c	(revision 14686)
+++ string.c	(revision 14687)
@@ -3025,7 +3025,8 @@
 
 	p += n;
 	if (c == '"'|| c == '\\' ||
-	    (c == '#' && (cc = rb_enc_codepoint(p,pend,enc),
+	    (c == '#' && p < pend &&
+                          (cc = rb_enc_codepoint(p,pend,enc),
 			  (cc == '$' || cc == '@' || cc == '{')))) {
 	    prefix_escape(result, c, enc);
 	}

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