nobu	2010-08-05 20:00:18 +0900 (Thu, 05 Aug 2010)

  New Revision: 28871

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

  Log:
    * string.c (rb_str_set_len): bail out when buffer overflowed
      probably.

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28870)
+++ ChangeLog	(revision 28871)
@@ -1,3 +1,8 @@
+Thu Aug  5 19:59:55 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_set_len): bail out when buffer overflowed
+	  probably.
+
 Thu Aug  5 19:51:21 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_compile_each): drop unused ARGSCAT results.
Index: string.c
===================================================================
--- string.c	(revision 28870)
+++ string.c	(revision 28871)
@@ -1693,10 +1693,15 @@
 void
 rb_str_set_len(VALUE str, long len)
 {
+    long capa;
+
     str_modifiable(str);
     if (STR_SHARED_P(str)) {
 	rb_raise(rb_eRuntimeError, "can't set length of shared string");
     }
+    if (len > (capa = (long)rb_str_capacity(str))) {
+	rb_bug("probable buffer overflow: %ld for %ld", len, capa);
+    }
     STR_SET_LEN(str, len);
     RSTRING_PTR(str)[len] = '\0';
 }

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