mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* string.c (rb_str_set_len): bail out when buffer overflowed
probably. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
50b5049921
commit
b80ddbf461
2 changed files with 10 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Aug 5 19:59:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* string.c (rb_str_set_len): bail out when buffer overflowed
|
||||||
|
probably.
|
||||||
|
|
||||||
Thu Aug 5 19:51:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Aug 5 19:51:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* compile.c (iseq_compile_each): drop unused ARGSCAT results.
|
* compile.c (iseq_compile_each): drop unused ARGSCAT results.
|
||||||
|
|
5
string.c
5
string.c
|
@ -1693,10 +1693,15 @@ rb_str_unlocktmp(VALUE str)
|
||||||
void
|
void
|
||||||
rb_str_set_len(VALUE str, long len)
|
rb_str_set_len(VALUE str, long len)
|
||||||
{
|
{
|
||||||
|
long capa;
|
||||||
|
|
||||||
str_modifiable(str);
|
str_modifiable(str);
|
||||||
if (STR_SHARED_P(str)) {
|
if (STR_SHARED_P(str)) {
|
||||||
rb_raise(rb_eRuntimeError, "can't set length of shared string");
|
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);
|
STR_SET_LEN(str, len);
|
||||||
RSTRING_PTR(str)[len] = '\0';
|
RSTRING_PTR(str)[len] = '\0';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue