mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* string.c (str_make_independent_expand): fix buffer overflow
while shrinking. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a2ebc53ec4
commit
ae82480705
2 changed files with 7 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Aug 5 12:39:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* string.c (str_make_independent_expand): fix buffer overflow
|
||||
while shrinking.
|
||||
|
||||
Thu Aug 5 06:42:31 2010 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* file.c (realpath_rec): call rb_str_modify before rb_str_set_len.
|
||||
|
|
3
string.c
3
string.c
|
@ -1271,8 +1271,9 @@ str_make_independent_expand(VALUE str, long expand)
|
|||
|
||||
ptr = ALLOC_N(char, len+expand+1);
|
||||
if (RSTRING_PTR(str)) {
|
||||
memcpy(ptr, RSTRING_PTR(str), len);
|
||||
memcpy(ptr, RSTRING_PTR(str), expand < 0 ? len + expand : len);
|
||||
}
|
||||
len += expand;
|
||||
STR_SET_NOEMBED(str);
|
||||
ptr[len] = 0;
|
||||
RSTRING(str)->as.heap.ptr = ptr;
|
||||
|
|
Loading…
Add table
Reference in a new issue