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

* complex.c (string_to_c_strict, string_to_c): check NUL.

Browse source 
* rational.c (string_to_r_strict, string_to_r): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2012-11-22 11:32:52 +00:00
parent 84a57715e1
commit d6ec400148
3 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 22 20:32:07 2012 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (string_to_c_strict, string_to_c): check NUL.
* rational.c (string_to_r_strict, string_to_r): ditto.
Thu Nov 22 20:21:45 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* Makefile.in (.dmyh.h): removed $(VPATH). GNU make don't

24
complex.c
View file

@ -1776,16 +1776,25 @@ parse_comp(const char *s, int strict,
static VALUE
string_to_c_strict(VALUE self)
{
const char *s;
char *s;
VALUE num;
rb_must_asciicompat(self);
s = RSTRING_PTR(self);
if (memchr(s, 0, RSTRING_LEN(self)))
if (!s || memchr(s, '\0', RSTRING_LEN(self)))
rb_raise(rb_eArgError, "string contains null byte");
if (s && s[RSTRING_LEN(self)]) {
rb_str_modify(self);
s = RSTRING_PTR(self);
s[RSTRING_LEN(self)] = '\0';
}
if (!s)
s = (char *)"";
if (!parse_comp(s, 1, &num)) {
VALUE ins = f_inspect(self);
rb_raise(rb_eArgError, "invalid value for convert(): %s",
@ -1819,13 +1828,22 @@ string_to_c_strict(VALUE self)
static VALUE
string_to_c(VALUE self)
{
const char *s;
char *s;
VALUE num;
rb_must_asciicompat(self);
s = RSTRING_PTR(self);
if (s && s[RSTRING_LEN(self)]) {
rb_str_modify(self);
s = RSTRING_PTR(self);
s[RSTRING_LEN(self)] = '\0';
}
if (!s)
s = (char *)"";
(void)parse_comp(s, 0, &num);
return num;

24
rational.c
View file

@ -2143,16 +2143,25 @@ parse_rat(const char *s, int strict,
static VALUE
string_to_r_strict(VALUE self)
{
const char *s;
char *s;
VALUE num;
rb_must_asciicompat(self);
s = RSTRING_PTR(self);
if (memchr(s, 0, RSTRING_LEN(self)))
if (!s || memchr(s, '\0', RSTRING_LEN(self)))
rb_raise(rb_eArgError, "string contains null byte");
if (s && s[RSTRING_LEN(self)]) {
rb_str_modify(self);
s = RSTRING_PTR(self);
s[RSTRING_LEN(self)] = '\0';
}
if (!s)
s = (char *)"";
if (!parse_rat(s, 1, &num)) {
VALUE ins = f_inspect(self);
rb_raise(rb_eArgError, "invalid value for convert(): %s",
@ -2188,13 +2197,22 @@ string_to_r_strict(VALUE self)
static VALUE
string_to_r(VALUE self)
{
const char *s;
char *s;
VALUE num;
rb_must_asciicompat(self);
s = RSTRING_PTR(self);
if (s && s[RSTRING_LEN(self)]) {
rb_str_modify(self);
s = RSTRING_PTR(self);
s[RSTRING_LEN(self)] = '\0';
}
if (!s)
s = (char *)"";
(void)parse_rat(s, 0, &num);
if (RB_TYPE_P(num, T_FLOAT))