зеркало из https://github.com/github/ruby.git
string.c: adjust buffer size
* string.c (tr_trans): adjust buffer size by processed and rest lengths, instead of doubling repeatedly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
cc9f1e9195
Коммит
1cbc622ea7
|
@ -1,3 +1,8 @@
|
|||
Thu Jun 16 12:17:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* string.c (tr_trans): adjust buffer size by processed and rest
|
||||
lengths, instead of doubling repeatedly.
|
||||
|
||||
Thu Jun 16 11:15:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* string.c (tr_trans): consider terminator length and fix heap
|
||||
|
|
10
string.c
10
string.c
|
@ -6342,9 +6342,8 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
|
|||
c = c0;
|
||||
if (enc != e1) may_modify = 1;
|
||||
}
|
||||
while (t - buf + tlen >= max) {
|
||||
offset = t - buf;
|
||||
max *= 2;
|
||||
if ((offset = t - buf) + tlen > max) {
|
||||
max = offset + tlen + (send - s);
|
||||
REALLOC_N(buf, char, max + termlen);
|
||||
t = buf + offset;
|
||||
}
|
||||
|
@ -6415,9 +6414,8 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
|
|||
c = c0;
|
||||
if (enc != e1) may_modify = 1;
|
||||
}
|
||||
while (t - buf + tlen >= max) {
|
||||
offset = t - buf;
|
||||
max *= 2;
|
||||
if ((offset = t - buf) + tlen > max) {
|
||||
max = offset + tlen + (long)((send - s) * 1.2);
|
||||
REALLOC_N(buf, char, max + termlen);
|
||||
t = buf + offset;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче