diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-01-08 21:42:50 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-08 21:42:50 +0900 |
| commit | 712a8bb1b2afd48a695933a671c118f9dfa372a4 (patch) | |
| tree | 2b71f09ce2bff059e35d8ca8bf5cd12267944a45 /src/load.c | |
| parent | b575d0c45ef21f0f51fc31be8612333fe16e8a8e (diff) | |
| parent | 68735d12614ef72b620736a5cd3052fb79445483 (diff) | |
| download | mruby-712a8bb1b2afd48a695933a671c118f9dfa372a4.tar.gz mruby-712a8bb1b2afd48a695933a671c118f9dfa372a4.zip | |
Merge pull request #4219 from shuujii/fix-dump-load-float-literal-evaluate-to-infinity
Fix dump/load float leteral evaluate to infinity
Diffstat (limited to 'src/load.c')
| -rw-r--r-- | src/load.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/load.c b/src/load.c index 559fff1d4..55e0845f3 100644 --- a/src/load.c +++ b/src/load.c @@ -7,6 +7,7 @@ #include <limits.h> #include <stdlib.h> #include <string.h> +#include <math.h> #include <mruby/dump.h> #include <mruby/irep.h> #include <mruby/proc.h> @@ -40,6 +41,23 @@ offset_crc_body(void) return ((uint8_t *)header.binary_crc - (uint8_t *)&header) + sizeof(header.binary_crc); } +#ifndef MRB_WITHOUT_FLOAT +static double +str_to_double(mrb_state *mrb, mrb_value str) +{ + const char *p = RSTRING_PTR(str); + mrb_int len = RSTRING_LEN(str); + + /* `i`, `inf`, `infinity` */ + if (len > 0 && p[0] == 'i') return INFINITY; + + /* `I`, `-inf`, `-infinity` */ + if (p[0] == 'I' || (len > 1 && p[0] == '-' && p[1] == 'i')) return -INFINITY; + + return mrb_str_to_dbl(mrb, str, TRUE); +} +#endif + static mrb_irep* read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flags) { @@ -125,7 +143,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag #ifndef MRB_WITHOUT_FLOAT case IREP_TT_FLOAT: - irep->pool[i] = mrb_float_pool(mrb, mrb_str_to_dbl(mrb, s, FALSE)); + irep->pool[i] = mrb_float_pool(mrb, str_to_double(mrb, s)); break; #endif |