mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
revert r50336
* string.c (str_buf_cat): expand later so that the buffer can be larger for further use. [Bug #11080] [Bug #11080] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9955bb0130
commit
2b0a6f47ac
2 changed files with 6 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sat Apr 25 14:26:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* string.c (str_buf_cat): expand later so that the buffer can be
|
||||||
|
larger for further use. [Bug #11080] [Bug #11080]
|
||||||
|
|
||||||
Fri Apr 24 23:48:45 2015 Akinori MUSHA <knu@iDaemons.org>
|
Fri Apr 24 23:48:45 2015 Akinori MUSHA <knu@iDaemons.org>
|
||||||
|
|
||||||
* misc/ruby-electric.el: Import version 2.2.3 from
|
* misc/ruby-electric.el: Import version 2.2.3 from
|
||||||
|
|
2
string.c
2
string.c
|
@ -2194,7 +2194,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
|
||||||
if (ptr >= sptr && ptr <= sptr + olen) {
|
if (ptr >= sptr && ptr <= sptr + olen) {
|
||||||
off = ptr - sptr;
|
off = ptr - sptr;
|
||||||
}
|
}
|
||||||
rb_str_modify_expand(str, len);
|
rb_str_modify(str);
|
||||||
if (len == 0) return 0;
|
if (len == 0) return 0;
|
||||||
if (STR_EMBED_P(str)) {
|
if (STR_EMBED_P(str)) {
|
||||||
capa = RSTRING_EMBED_LEN_MAX;
|
capa = RSTRING_EMBED_LEN_MAX;
|
||||||
|
|
Loading…
Add table
Reference in a new issue