Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MRI-Binding: Enforce UTF-8 string encoding

This commit is contained in:
Jonas Kulla 2013-10-19 18:57:34 +02:00
parent d5bc71f7ba
commit 30507d2f6f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binding-mri/binding-mri.cpp
View File

@ -26,6 +26,7 @@
#include "filesystem.h" #include "filesystem.h"
#include "./ruby/include/ruby.h" #include "./ruby/include/ruby.h"
#include "./ruby/include/ruby/encoding.h"
#include "zlib.h" #include "zlib.h"
@ -183,6 +184,8 @@ static void runCustomScript(const char *filename)
QByteArray scriptData = scriptFile.readAll(); QByteArray scriptData = scriptFile.readAll();
scriptFile.close(); scriptFile.close();
scriptData.prepend("#encoding:utf-8\n");
rb_eval_string_protect(scriptData.constData(), 0); rb_eval_string_protect(scriptData.constData(), 0);
} }
@ -285,13 +288,14 @@ static void runRMXPScripts()
} }
sc.decData = QByteArray(decodeBuffer.constData(), bufferLen); sc.decData = QByteArray(decodeBuffer.constData(), bufferLen);
sc.decData.prepend("#encoding:utf-8\n");
ruby_script(sc.name.constData()); ruby_script(sc.name.constData());
rb_gc_start(); rb_gc_start();
/* Execute code */ /* Execute code */
rb_eval_string_protect(decodeBuffer.constData(), 0); rb_eval_string_protect(sc.decData.constData(), 0);
VALUE exc = rb_gv_get("$!"); VALUE exc = rb_gv_get("$!");
if (rb_type(exc) != RUBY_T_NIL) if (rb_type(exc) != RUBY_T_NIL)
@ -302,6 +306,7 @@ static void runRMXPScripts()
static void mriBindingExecute() static void mriBindingExecute()
{ {
ruby_setup(); ruby_setup();
rb_enc_set_default_external(rb_enc_from_encoding(rb_utf8_encoding()));
RbData rbData; RbData rbData;
shState->setBindingData(&rbData); shState->setBindingData(&rbData);