From 88eca58268af0dbaf069ca5bdc912ba9ea6aab6e Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Thu, 2 Apr 2015 03:15:31 +0200 Subject: [PATCH] Revert "check Ruby strings for embedded null bytes" This reverts commit 29dfda0011e7ecaf88611679dcf0a3b9dd3f84da. It turned out to be a bad idea after all. --- binding-mri/binding-util.cpp | 2 +- binding-mri/bitmap-binding.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/binding-mri/binding-util.cpp b/binding-mri/binding-util.cpp index a663a18..e73d999 100644 --- a/binding-mri/binding-util.cpp +++ b/binding-mri/binding-util.cpp @@ -191,7 +191,7 @@ rb_get_args(int argc, VALUE *argv, const char *format, ...) if (!RB_TYPE_P(tmp, RUBY_T_STRING)) rb_raise(rb_eTypeError, "Argument %d: Expected string", argI); - *s = StringValueCStr(tmp); + *s = RSTRING_PTR(tmp); ++argI; break; diff --git a/binding-mri/bitmap-binding.cpp b/binding-mri/bitmap-binding.cpp index 8781d05..f1572fe 100644 --- a/binding-mri/bitmap-binding.cpp +++ b/binding-mri/bitmap-binding.cpp @@ -32,7 +32,7 @@ DEF_TYPE(Bitmap); static const char *objAsStringPtr(VALUE obj) { VALUE str = rb_obj_as_string(obj); - return StringValueCStr(str); + return RSTRING_PTR(str); } void bitmapInitProps(Bitmap *b, VALUE self)