kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead

Browse source 
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:
kosaki 2011-01-27 12:46:30 +00:00
parent 8d397b77ea
commit ac0178910e
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Thu Jan 27 21:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* win32/win32.c: get rid of STRNDUPA(). It's dangerous API. * win32/win32.c: get rid of STRNDUPA(). It's dangerous API.

11
object.c
View file

@ -2246,7 +2246,7 @@ rb_str_to_dbl(VALUE str, int badcheck)
char *s; char *s;
long len; long len;
double ret; double ret;
VALUE tmp = Qnil; VALUE v = 0;
StringValue(str); StringValue(str);
s = RSTRING_PTR(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"); rb_raise(rb_eArgError, "string for Float contains null byte");
} }
if (s[len]) { /* no sentinel somehow */ if (s[len]) { /* no sentinel somehow */
char *p; char *p = ALLOCV(v, len);
tmp = rb_str_tmp_new(len);
p = RSTRING_PTR(tmp);
MEMCPY(p, s, char, len); MEMCPY(p, s, char, len);
p[len] = '\0'; p[len] = '\0';
s = p; s = p;
} }
} }
ret = rb_cstr_to_dbl(s, badcheck); ret = rb_cstr_to_dbl(s, badcheck);
if (tmp != Qnil) if (v)
rb_str_resize(tmp, 0); ALLOCV_END(v);
return ret; return ret;
} }