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

MRI-Binding: Enforce UTF-8 strings in 'Marshal::load()' via aux proc

Browse source 
We override 'Marshal::load()' via alias and call it with
a custom auxiliary proc in the alias which sets the encoding
of all demarshalled strings to UTF-8. The case where a user
himself provided a proc to 'load()' is not implemented.

This is definitely a better solution than patching the ruby
source tree. Thanks to github.com/cremno for hints and help!
This commit is contained in:
Jonas Kulla 2013-10-20 15:51:24 +02:00
parent e14f3ef9db
commit 27341dc95d
2 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
binding-mri/filesystem-binding.cpp
View file

@ -24,6 +24,9 @@
#include "sharedstate.h"
#include "filesystem.h"
#include "ruby/encoding.h"
#include "ruby/intern.h"
#include <QDebug>
DEF_TYPE(FileInt);
@ -154,6 +157,34 @@ RB_METHOD(kernelSaveData)
return Qnil;
}
static VALUE stringForceUTF8(VALUE arg)
{
if (rb_type(arg) != RUBY_T_STRING)
return arg;
rb_enc_associate(arg, rb_utf8_encoding());
return arg;
}
RB_METHOD(_marshalLoad)
{
RB_UNUSED_PARAM;
VALUE port, proc = Qnil;
rb_get_args(argc, argv, "o|o", &port, &proc, RB_ARG_END);
if (rb_type(proc) != RUBY_T_NIL)
rb_raise(rb_eNotImpError, "MKXP: Marshal with custom proc not (yet) implemented");
VALUE utf8Proc = rb_proc_new(RUBY_METHOD_FUNC(stringForceUTF8), Qnil);
VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
return rb_funcall(marsh, rb_intern("_mkxp_load_alias"), 2, port, utf8Proc);
}
void
fileIntBindingInit()
{
@ -171,4 +202,11 @@ fileIntBindingInit()
_rb_define_module_function(rb_mKernel, "load_data", kernelLoadData);
_rb_define_module_function(rb_mKernel, "save_data", kernelSaveData);
/* We overload the built-in 'Marshal::load()' function to silently
* insert our utf8proc that ensures all read strings will be
* UTF-8 encoded */
VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load");
_rb_define_module_function(marsh, "load", _marshalLoad);
}