kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* file.c (file_expand_path): call rb_str_set_len before BUFCHECK to

Browse source 
prevent rb_str_resize in BUFCHECK discard the content.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-04-30 03:06:43 +00:00
parent 479fa40778
commit c41dc085d0
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Apr 30 12:05:20 2010 Tanaka Akira <akr@fsij.org>
* file.c (file_expand_path): call rb_str_set_len before BUFCHECK to
prevent rb_str_resize in BUFCHECK discard the content.
Fri Apr 30 11:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Fri Apr 30 11:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* string.c (rb_str_sub_bang): String#sub! now raises an error when * string.c (rb_str_sub_bang): String#sub! now raises an error when

4
file.c
View file

@ -2858,10 +2858,12 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
if (p > buf && p[-1] == '/') if (p > buf && p[-1] == '/')
--p; --p;
else { else {
rb_str_set_len(result, p-buf);
BUFCHECK(bdiff + 1 >= buflen); BUFCHECK(bdiff + 1 >= buflen);
*p = '/'; *p = '/';
} }
rb_str_set_len(result, p-buf+1);
BUFCHECK(bdiff + 1 >= buflen); BUFCHECK(bdiff + 1 >= buflen);
p[1] = 0; p[1] = 0;
root = skipprefix(buf); root = skipprefix(buf);
@ -2925,6 +2927,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
#endif #endif
if (s > b) { if (s > b) {
long rootdiff = root - buf; long rootdiff = root - buf;
rb_str_set_len(result, p-buf+1);
BUFCHECK(bdiff + (s-b+1) >= buflen); BUFCHECK(bdiff + (s-b+1) >= buflen);
root = buf + rootdiff; root = buf + rootdiff;
memcpy(++p, b, s-b); memcpy(++p, b, s-b);
@ -2955,6 +2958,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
} }
} }
#endif #endif
rb_str_set_len(result, p-buf+1);
BUFCHECK(bdiff + (s-b) >= buflen); BUFCHECK(bdiff + (s-b) >= buflen);
memcpy(++p, b, s-b); memcpy(++p, b, s-b);
p += s-b; p += s-b;