admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

bigint.c (mpz_set_int): check mp_limb overflow from mrb_int.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-08-04 17:42:19 +09:00
parent 798a2b1888
commit b7bc326b4c
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-bigint/core/bigint.c
+13 -8
View File
@@ -65,11 +65,13 @@ mpz_init_set(mrb_state *mrb, mpz_t *s, mpz_t *t)
mpz_set(mrb, s, t);
}
#define MRB_INT_MSB ((mrb_uint)1 << (MRB_INT_BIT-1))
#define MRB_INT_MASK (MRB_INT_MSB-1)
static void
mpz_set_int(mrb_state *mrb, mpz_t *y, mrb_int v)
{
mrb_uint u;
size_t len;
if (v == 0) {
y->sn=0;
@@ -84,15 +86,18 @@ mpz_set_int(mrb_state *mrb, mpz_t *y, mrb_int v)
if (v == MRB_INT_MIN) u = v;
else u = -v;
}
if (sizeof(mrb_int) > sizeof(mp_limb) && HIGH(u) != 0) {
len = 2;
#if MRB_INT_BIT > DIG_SIZE
if ((u & ~MRB_INT_MASK) != 0) {
mpz_realloc(mrb, y, 2);
y->p[1] = (mp_limb)(u >> (MRB_INT_BIT-1));
y->p[0] = (mp_limb)(u & MRB_INT_MASK);
}
else {
len = 1;
else
#endif
{
mpz_realloc(mrb, y, 1);
y->p[0] = (mp_limb)u;
}
mpz_realloc(mrb, y, len);
y->p[0] = LOW(u);
if (len > 1) y->p[1] = HIGH(u);
}
static void
mrbgems/mruby-bigint/core/bigint.h
+6 -1
View File
@@ -30,16 +30,21 @@
#include <sys/types.h>
#if defined(MRB_INT32) && defined(_WIN32) && !defined(MRB_NO_MPZ64BIT)
#define MRB_NO_MPZ64BIT
#endif
#ifdef MRB_NO_MPZ64BIT
typedef uint16_t mp_limb;
typedef uint32_t mp_limb2;
typedef int32_t mp_limb2s;
#define MPZ_DIG_SIZE 16
#else
typedef uint32_t mp_limb;
typedef uint64_t mp_limb2;
typedef int64_t mp_limb2s;
#define MPZ_DIG_SIZE 32
#endif
#define MPZ_DIG_SIZE (sizeof(mp_limb)*8)
typedef struct _mpz_t {
mp_limb *p;