* bignum.c (validate_integer_pack_format): numwords argument added.

  Move a varidation from rb_integer_pack_internal and rb_integer_unpack.
  (rb_integer_pack_internal): Follow above change.
  (rb_integer_unpack): Ditto.



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

2 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index fdde53408d..ed984ca912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 11 22:25:04 2013  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (validate_integer_pack_format): numwords argument added.
+	  Move a varidation from rb_integer_pack_internal and rb_integer_unpack.
+	  (rb_integer_pack_internal): Follow above change.
+	  (rb_integer_unpack): Ditto.
+
 Tue Jun 11 20:52:43 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (rb_integer_pack_internal): Renamed from rb_integer_pack
diff --git a/bignum.c b/bignum.c
index 20062e99ae..8e7e44427d 100644
--- a/bignum.c
+++ b/bignum.c
@@ -735,7 +735,7 @@ rb_absint_singlebit_p(VALUE val)
      INTEGER_PACK_NATIVE_BYTE_ORDER)
 
 static void
-validate_integer_pack_format(size_t wordsize, size_t nails, int flags)
+validate_integer_pack_format(size_t numwords, size_t wordsize, size_t nails, int flags)
 {
     int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK;
     int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK;
@@ -752,6 +752,8 @@ validate_integer_pack_format(size_t wordsize, size_t nails, int flags)
         rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
     if (wordsize <= nails / CHAR_BIT)
         rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails);
+    if (SIZE_MAX / wordsize < numwords)
+        rb_raise(rb_eArgError, "too big numwords * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", numwords, wordsize);
 }
 
 static void
@@ -852,9 +854,7 @@ rb_integer_pack_internal(VALUE val, void *words, size_t numwords, size_t wordsiz
 
     val = rb_to_int(val);
 
-    validate_integer_pack_format(wordsize, nails, flags);
-    if (SIZE_MAX / wordsize < numwords)
-        rb_raise(rb_eArgError, "too big numwords * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", numwords, wordsize);
+    validate_integer_pack_format(numwords, wordsize, nails, flags);
 
     if (FIXNUM_P(val)) {
         long v = FIX2LONG(val);
@@ -1207,9 +1207,7 @@ rb_integer_unpack(int sign, const void *words, size_t numwords, size_t wordsize,
     BDIGIT_DBL dd;
     int numbits_in_dd;
 
-    validate_integer_pack_format(wordsize, nails, flags);
-    if (SIZE_MAX / wordsize < numwords)
-        rb_raise(rb_eArgError, "too big numwords * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", numwords, wordsize);
+    validate_integer_pack_format(numwords, wordsize, nails, flags);
     if (sign != 1 && sign != 0 && sign != -1)
         rb_raise(rb_eArgError, "unexpected sign: %d", sign);