diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-24 12:30:02 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-24 12:30:02 +0000 |
commit | 2ec31553eabe374a1f8c1b8edf0d2bb4c548949f (patch) | |
tree | 7fd9bcaccbdf935467d918c62aa30b649bfa9d49 | |
parent | 76789bbbb3dd74b3a9bdd6ccb98999b59699b7ba (diff) |
* object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because
ALLOC_N may cause stack overflow.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | object.c | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Jan 24 21:28:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because + ALLOC_N may cause stack overflow. + Mon Jan 24 21:04:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c (rb_invalid_str): prevent intermediate variable from GC. @@ -2245,6 +2245,8 @@ rb_str_to_dbl(VALUE str, int badcheck) { char *s; long len; + double ret; + char *alloced = NULL; StringValue(str); s = RSTRING_PTR(str); @@ -2254,14 +2256,16 @@ rb_str_to_dbl(VALUE str, int badcheck) rb_raise(rb_eArgError, "string for Float contains null byte"); } if (s[len]) { /* no sentinel somehow */ - char *p = ALLOCA_N(char, len+1); - + char *p = alloced = ALLOC_N(char, len+1); MEMCPY(p, s, char, len); p[len] = '\0'; s = p; } } - return rb_cstr_to_dbl(s, badcheck); + ret = rb_cstr_to_dbl(s, badcheck); + if (alloced) + xfree(alloced); + return ret; } VALUE |