summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-02 12:20:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-02 12:20:00 +0000
commit4658478ae1b0023c9ad17a67e98fb81b2c3b941c (patch)
tree048f97f93f5a682d191606fb36f4dd42c2e47669
parent2ade221827476c0a6727bce6456ce856dec05819 (diff)
* bignum.c (rb_cstr_to_inum): Merge two temporary buffers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bignum.c12
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 94f33d6e11..5daca05a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 2 21:17:37 2013 Tanaka Akira <akr@fsij.org>
+
+ * bignum.c (rb_cstr_to_inum): Merge two temporary buffers.
+
Tue Jul 2 20:25:04 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_cstr_to_inum): Use BDIGIT_DBL to collect adjacent digits.
diff --git a/bignum.c b/bignum.c
index 1377f55a6c..8c80c3da64 100644
--- a/bignum.c
+++ b/bignum.c
@@ -2095,7 +2095,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
int j;
size_t num_bdigits;
size_t unit;
- VALUE tmpu = 0, tmpv = 0;
+ VALUE tmpuv = 0;
BDIGIT *uds, *vds, *tds;
power = maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -2103,8 +2103,8 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
size = p - buf;
num_bdigits = roomof(size, digits_per_bdigits_dbl)*2;
- uds = ALLOCV_N(BDIGIT, tmpu, num_bdigits);
- vds = ALLOCV_N(BDIGIT, tmpv, num_bdigits);
+ uds = ALLOCV_N(BDIGIT, tmpuv, 2*num_bdigits);
+ vds = uds + num_bdigits;
powerv = bignew(2, 1);
BDIGITS(powerv)[0] = BIGLO(power);
@@ -2151,10 +2151,8 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
z = bignew(num_bdigits, sign);
MEMCPY(BDIGITS(z), uds, BDIGIT, num_bdigits);
- if (tmpv)
- ALLOCV_END(tmpv);
- if (tmpu)
- ALLOCV_END(tmpu);
+ if (tmpuv)
+ ALLOCV_END(tmpuv);
}
}