merges r22471 from trunk into ruby_1_9_1.

	* util.c (rv_alloc, freedtoa): use our normal xmalloc()/xfree() because
	  couldn't free the returned pointer from ruby_dtoa().

	* missing/vsnprintf.c (cvt): receive buffer and use/return it instead
	  of returning the pointer returned from BSD__dtoa().

	* missing/vsnprintf.c (BSD_vfprintf): pass buf to cvt() as the buffer.
	  [ruby-core:22184]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 13 deletions

diff --git a/util.c b/util.c
index dc85183b1e..4bc82f6d04 100644
--- a/util.c
+++ b/util.c
@@ -3058,20 +3058,11 @@ static char *dtoa_result;
 static char *
 rv_alloc(int i)
 {
-    int j, k, *r;
-
-    j = sizeof(ULong);
-    for (k = 0;
-            sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
-            j <<= 1)
-        k++;
-    r = (int*)Balloc(k);
-    *r = k;
     return
 #ifndef MULTIPLE_THREADS
         dtoa_result =
 #endif
-        (char *)(r+1);
+        xmalloc(i);
 }
 
 static char *
@@ -3096,9 +3087,7 @@ nrv_alloc(const char *s, char **rve, int n)
 static void
 freedtoa(char *s)
 {
-    Bigint *b = (Bigint *)((int *)s - 1);
-    b->maxwds = 1 << (b->k = *(int*)b);
-    Bfree(b);
+    xfree(s);
 }
 #endif