* signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().

  [ruby-dev:26440]

* io.c (rb_io_inspect): replace sprintf() with "%s" format all
  over the place by snprintf() to avoid integer overflow.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/struct.c b/struct.c
index 17fc72b1e..a8429a405 100644
--- a/struct.c
+++ b/struct.c
@@ -477,9 +477,10 @@ inspect_struct(s, dummy, recur)
 
     if (recur) {
 	char *cname = rb_class2name(rb_obj_class(s));
-	VALUE str = rb_str_new(0, strlen(cname) + 15);
+	size_t len = strlen(cname) + 15;
+	VALUE str = rb_str_new(0, len);
 
-	sprintf(RSTRING(str)->ptr, "#<struct %s:...>", cname);
+	snprintf(RSTRING(str)->ptr, len, "#<struct %s:...>", cname);
 	RSTRING(str)->len = strlen(RSTRING(str)->ptr);
 	return str;
     }