diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-02 19:21:18 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-02 19:21:18 +0000 |
commit | a9befcdb08db9940b0bdde96c7447bb4730d3872 (patch) | |
tree | ddd612d4cdb16c7d253fef4b93440fa52c09181b | |
parent | 0989529f88efc0882fd5f567350d196664bf8318 (diff) |
avoid large alloca on Complex/Rational calls
* complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
[Bug #9608]
* rational.c (read_digits): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | complex.c | 23 | ||||
-rw-r--r-- | rational.c | 4 |
3 files changed, 24 insertions, 9 deletions
@@ -1,3 +1,9 @@ +Sat May 3 04:04:16 2014 Eric Wong <e@80x24.org> + + * complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END + [Bug #9608] + * rational.c (read_digits): ditto + Sat May 3 00:06:30 2014 Naohisa Goto <ngotogenome@gmail.com> * file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename @@ -1726,19 +1726,26 @@ parse_comp(const char *s, int strict, VALUE *num) { char *buf, *b; + VALUE tmp; + int ret = 1; - buf = ALLOCA_N(char, strlen(s) + 1); + buf = ALLOCV_N(char, tmp, strlen(s) + 1); b = buf; skip_ws(&s); - if (!read_comp(&s, strict, num, &b)) - return 0; - skip_ws(&s); + if (!read_comp(&s, strict, num, &b)) { + ret = 0; + } + else { + skip_ws(&s); - if (strict) - if (*s != '\0') - return 0; - return 1; + if (strict) + if (*s != '\0') + ret = 0; + } + ALLOCV_END(tmp); + + return ret; } static VALUE diff --git a/rational.c b/rational.c index 60ff356b22..517a79769e 100644 --- a/rational.c +++ b/rational.c @@ -2136,13 +2136,14 @@ read_digits(const char **s, int strict, { char *b, *bb; int us = 1, ret = 1; + VALUE tmp; if (!isdecimal(**s)) { *num = ZERO; return 0; } - bb = b = ALLOCA_N(char, strlen(*s) + 1); + bb = b = ALLOCV_N(char, tmp, strlen(*s) + 1); while (isdecimal(**s) || **s == '_') { if (**s == '_') { @@ -2169,6 +2170,7 @@ read_digits(const char **s, int strict, conv: *b = '\0'; *num = rb_cstr_to_inum(bb, 10, 0); + ALLOCV_END(tmp); return ret; } |