diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 08:31:04 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-19 08:31:04 +0000 |
commit | 20316027872b9a3a70babc884f838f499f1e5746 (patch) | |
tree | ffade6e5d1945bcecdd7236487b5f94a59b501a6 /error.c | |
parent | 1fb55b9d7704c4e3df0118fe33890b65538dd06a (diff) | |
download | ruby-20316027872b9a3a70babc884f838f499f1e5746.tar.gz |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@8800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -956,9 +956,10 @@ syserr_initialize(argc, argv, self) else err = "unknown error"; if (!NIL_P(mesg)) { VALUE str = mesg; + size_t len = strlen(err)+RSTRING(str)->len+3; StringValue(str); - mesg = rb_str_new(0, strlen(err)+RSTRING(str)->len+3); - sprintf(RSTRING(mesg)->ptr, "%s - %.*s", err, + mesg = rb_str_new(0, len); + snprintf(RSTRING(mesg)->ptr, len, "%s - %.*s", err, (int)RSTRING(str)->len, RSTRING(str)->ptr); rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr)); } |