do not segfault when raising for invalid charset

There's no guarantee the user passed a string object, I encountered this when running tests under 1.9.3dev
brianmario · Mar 25, 2011 · ef2552c · ef2552c
1 parent 9f9e16d
commit ef2552c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -586,7 +586,8 @@ static VALUE set_charset_name(VALUE self, VALUE value) {
 #ifdef HAVE_RUBY_ENCODING_H
   new_encoding = rb_funcall(cMysql2Client, intern_encoding_from_charset, 1, value);
   if (new_encoding == Qnil) {
-    rb_raise(cMysql2Error, "Unsupported charset: '%s'", RSTRING_PTR(value));
+    VALUE inspect = rb_inspect(value);
+    rb_raise(cMysql2Error, "Unsupported charset: '%s'", RSTRING_PTR(inspect));
   } else {
     if (wrapper->encoding == Qnil) {
       wrapper->encoding = new_encoding;