generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 04:52:59 +01:00
Code Issues Projects Releases Wiki Activity

ruby: set encoding to 'ASCII-8BIT' before deserializing on ruby-1.9

Browse Source
This commit is contained in:
frsyuki 2010-04-17 20:02:47 +09:00
parent a55affe4d5
commit 228f742b2f
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruby/unpack.c
View File

@ -16,11 +16,17 @@
* limitations under the License.
*/
#include "ruby.h"
#include "msgpack/unpack_define.h"
static ID s_sysread;
static ID s_readpartial;
#ifdef HAVE_RUBY_ENCODING_H
#include "ruby/encoding.h"
int s_ascii_8bit;
#endif
typedef struct {
int finished;
VALUE source;
@ -426,6 +432,12 @@ static inline VALUE MessagePack_unpack_impl(VALUE self, VALUE data, unsigned lon
unpack_user u = {0, Qnil, 0, 0, Qnil, Qnil, Qnil};
mp.user = u;
#ifdef HAVE_RUBY_ENCODING_H
// FIXME encodingをASCII-8BITにする
int enc_orig = rb_enc_get_index(data);
rb_enc_set_index(data, s_ascii_8bit);
#endif
// FIXME execute実行中はmp->topが更新されないのでGC markが機能しない
rb_gc_disable();
VALUE args[3] = {(VALUE)&mp, data, (VALUE)dlen};
@ -433,6 +445,10 @@ static inline VALUE MessagePack_unpack_impl(VALUE self, VALUE data, unsigned lon
MessagePack_unpack_rescue, Qnil);
rb_gc_enable();
#ifdef HAVE_RUBY_ENCODING_H
rb_enc_set_index(data, enc_orig);
#endif
return ret;
}
@ -453,6 +469,11 @@ void Init_msgpack_unpack(VALUE mMessagePack)
{
s_sysread = rb_intern("sysread");
s_readpartial = rb_intern("readpartial");
#ifdef HAVE_RUBY_ENCODING_H
s_ascii_8bit = rb_enc_find_index("ASCII-8BIT");
#endif
eUnpackError = rb_define_class_under(mMessagePack, "UnpackError", rb_eStandardError);
cUnpacker = rb_define_class_under(mMessagePack, "Unpacker", rb_cObject);
rb_define_alloc_func(cUnpacker, MessagePack_Unpacker_alloc);