diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 09:21:11 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 09:21:11 +0000 |
commit | 4e0685faeaba694641c30c5d93fd6be0e8b875f8 (patch) | |
tree | d83bc53869594f7bf0092378c218834e67ed10ee | |
parent | 2a23bd620223e6ee4825220bcac39b69ffa6d0fe (diff) | |
download | ruby-4e0685faeaba694641c30c5d93fd6be0e8b875f8.tar.gz |
* bignum.c (validate_integer_pack_format): supported_flags argument
added and validate given flags.
(rb_integer_pack_internal): Specify supported_flags.
(rb_integer_unpack): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | bignum.c | 22 |
2 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Wed Jun 12 18:19:41 2013 Tanaka Akira <akr@fsij.org> + + * bignum.c (validate_integer_pack_format): supported_flags argument + added and validate given flags. + (rb_integer_pack_internal): Specify supported_flags. + (rb_integer_unpack): Ditto. + Wed Jun 12 16:41:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_sort_bang): remove duplicated assertions. @@ -735,10 +735,14 @@ rb_absint_singlebit_p(VALUE val) INTEGER_PACK_NATIVE_BYTE_ORDER) static void -validate_integer_pack_format(size_t numwords, size_t wordsize, size_t nails, int flags) +validate_integer_pack_format(size_t numwords, size_t wordsize, size_t nails, int flags, int supported_flags) { int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK; int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK; + + if (flags & ~supported_flags) { + rb_raise(rb_eArgError, "unsupported flags specified"); + } if (wordorder_bits == 0) { if (1 < numwords) rb_raise(rb_eArgError, "word order not specified"); @@ -861,7 +865,12 @@ rb_integer_pack_internal(VALUE val, void *words, size_t numwords, size_t wordsiz val = rb_to_int(val); - validate_integer_pack_format(numwords, wordsize, nails, flags); + validate_integer_pack_format(numwords, wordsize, nails, flags, + INTEGER_PACK_MSWORD_FIRST| + INTEGER_PACK_LSWORD_FIRST| + INTEGER_PACK_MSBYTE_FIRST| + INTEGER_PACK_LSBYTE_FIRST| + INTEGER_PACK_NATIVE_BYTE_ORDER); if (FIXNUM_P(val)) { long v = FIX2LONG(val); @@ -1215,7 +1224,14 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na BDIGIT_DBL dd; int numbits_in_dd; - validate_integer_pack_format(numwords, wordsize, nails, flags); + validate_integer_pack_format(numwords, wordsize, nails, flags, + INTEGER_PACK_MSWORD_FIRST| + INTEGER_PACK_LSWORD_FIRST| + INTEGER_PACK_MSBYTE_FIRST| + INTEGER_PACK_LSBYTE_FIRST| + INTEGER_PACK_NATIVE_BYTE_ORDER| + INTEGER_PACK_FORCE_BIGNUM| + INTEGER_PACK_NEGATIVE); if (numwords <= (SIZE_MAX - (SIZEOF_BDIGITS*CHAR_BIT-1)) / CHAR_BIT / wordsize) { num_bdigits = integer_unpack_num_bdigits_small(numwords, wordsize, nails); |