mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
rb_str_tmp_new(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8d397b77ea
commit
ac0178910e
2 changed files with 9 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Jan 27 21:43:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
|
||||
rb_str_tmp_new().
|
||||
|
||||
Thu Jan 27 21:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
|
||||
|
|
11
object.c
11
object.c
|
@ -2246,7 +2246,7 @@ rb_str_to_dbl(VALUE str, int badcheck)
|
|||
char *s;
|
||||
long len;
|
||||
double ret;
|
||||
VALUE tmp = Qnil;
|
||||
VALUE v = 0;
|
||||
|
||||
StringValue(str);
|
||||
s = RSTRING_PTR(str);
|
||||
|
@ -2256,18 +2256,15 @@ 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;
|
||||
|
||||
tmp = rb_str_tmp_new(len);
|
||||
p = RSTRING_PTR(tmp);
|
||||
char *p = ALLOCV(v, len);
|
||||
MEMCPY(p, s, char, len);
|
||||
p[len] = '\0';
|
||||
s = p;
|
||||
}
|
||||
}
|
||||
ret = rb_cstr_to_dbl(s, badcheck);
|
||||
if (tmp != Qnil)
|
||||
rb_str_resize(tmp, 0);
|
||||
if (v)
|
||||
ALLOCV_END(v);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue