MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Merge pull request #69 from cremno/check-ruby-string-for-embedded-null-bytes 

MRI: check Ruby strings for embedded null bytes
This commit is contained in:
Jonas Kulla 2014-09-12 23:30:07 +02:00
parent f49cd4391a 29dfda0011
commit 61b77c2027
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding-mri/binding-util.cpp
View File

@ -189,7 +189,7 @@ rb_get_args(int argc, VALUE *argv, const char *format, ...)
if (!RB_TYPE_P(tmp, RUBY_T_STRING)) if (!RB_TYPE_P(tmp, RUBY_T_STRING))
rb_raise(rb_eTypeError, "Argument %d: Expected string", argI); rb_raise(rb_eTypeError, "Argument %d: Expected string", argI);
*s = RSTRING_PTR(tmp); *s = StringValueCStr(tmp);
++argI; ++argI;
break; break;

2
binding-mri/bitmap-binding.cpp
View File

@ -32,7 +32,7 @@ DEF_TYPE(Bitmap);
static const char *objAsStringPtr(VALUE obj) static const char *objAsStringPtr(VALUE obj)
{ {
VALUE str = rb_obj_as_string(obj); VALUE str = rb_obj_as_string(obj);
return RSTRING_PTR(str); return StringValueCStr(str);
} }
void bitmapInitProps(Bitmap *b, VALUE self) void bitmapInitProps(Bitmap *b, VALUE self)