1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (enc_arg): take arg as VALUE * to prevent GC problem.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-12 15:39:46 +00:00
parent c0bd38eb94
commit aa423b9311
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Sep 13 00:38:54 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (enc_arg): take arg as VALUE * to prevent GC problem.
Fri Sep 12 23:19:41 2008 Tanaka Akira <akr@fsij.org> Fri Sep 12 23:19:41 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_add_transcoder_at): fix loop condition. * transcode.c (rb_econv_add_transcoder_at): fix loop condition.

17
transcode.c
View File

@ -2361,17 +2361,17 @@ rb_econv_open_opts(const char *source_encoding, const char *destination_encoding
} }
static int static int
enc_arg(VALUE arg, const char **name_p, rb_encoding **enc_p) enc_arg(volatile VALUE *arg, const char **name_p, rb_encoding **enc_p)
{ {
rb_encoding *enc; rb_encoding *enc;
const char *n; const char *n;
int encidx; int encidx;
VALUE encval; VALUE encval;
if ((encidx = rb_to_encoding_index(encval = arg)) < 0) { if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
enc = NULL; enc = NULL;
encidx = 0; encidx = 0;
n = StringValueCStr(encval); n = StringValueCStr(*arg);
} }
else { else {
enc = rb_enc_from_index(encidx); enc = rb_enc_from_index(encidx);
@ -2385,7 +2385,7 @@ enc_arg(VALUE arg, const char **name_p, rb_encoding **enc_p)
} }
static int static int
str_transcode_enc_args(VALUE str, VALUE arg1, VALUE arg2, str_transcode_enc_args(VALUE str, volatile VALUE *arg1, volatile VALUE *arg2,
const char **sname_p, rb_encoding **senc_p, const char **sname_p, rb_encoding **senc_p,
const char **dname_p, rb_encoding **denc_p) const char **dname_p, rb_encoding **denc_p)
{ {
@ -2395,7 +2395,7 @@ str_transcode_enc_args(VALUE str, VALUE arg1, VALUE arg2,
dencidx = enc_arg(arg1, &dname, &denc); dencidx = enc_arg(arg1, &dname, &denc);
if (NIL_P(arg2)) { if (NIL_P(*arg2)) {
sencidx = rb_enc_get_index(str); sencidx = rb_enc_get_index(str);
senc = rb_enc_from_index(sencidx); senc = rb_enc_from_index(sencidx);
sname = rb_enc_name(senc); sname = rb_enc_name(senc);
@ -2416,6 +2416,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts)
{ {
VALUE dest; VALUE dest;
VALUE str = *self; VALUE str = *self;
volatile VALUE arg1, arg2;
long blen, slen; long blen, slen;
unsigned char *buf, *bp, *sp; unsigned char *buf, *bp, *sp;
const unsigned char *fromp; const unsigned char *fromp;
@ -2427,7 +2428,9 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts)
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
} }
dencidx = str_transcode_enc_args(str, argv[0], argc==1 ? Qnil : argv[1], &sname, &senc, &dname, &denc); arg1 = argv[0];
arg2 = argc==1 ? Qnil : argv[1];
dencidx = str_transcode_enc_args(str, &arg1, &arg2, &sname, &senc, &dname, &denc);
if ((ecflags & (ECONV_UNIVERSAL_NEWLINE_DECORATOR| if ((ecflags & (ECONV_UNIVERSAL_NEWLINE_DECORATOR|
ECONV_CRLF_NEWLINE_DECORATOR| ECONV_CRLF_NEWLINE_DECORATOR|
@ -2637,7 +2640,7 @@ econv_s_asciicompat_encoding(VALUE klass, VALUE arg)
const char *arg_name, *result_name; const char *arg_name, *result_name;
rb_encoding *arg_enc, *result_enc; rb_encoding *arg_enc, *result_enc;
enc_arg(arg, &arg_name, &arg_enc); enc_arg(&arg, &arg_name, &arg_enc);
result_name = rb_econv_asciicompat_encoding(arg_name); result_name = rb_econv_asciicompat_encoding(arg_name);