diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/syck/rubyext.c | 18 |
2 files changed, 14 insertions, 12 deletions
@@ -1,3 +1,7 @@ +Sat Dec 31 19:50:38 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * ext/syck/rubyext.c: attribute name was truncated with Rev1.64. + Sat Dec 31 11:53:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * lib/generator.rb: (Generator#initialize): should kill @loop_thread @@ -13,12 +17,12 @@ Fri Dec 30 18:22:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Dec 30 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> - * lib/generator.rb: (Generator#initialize) ensured to stop @loop_thread. + * lib/generator.rb (Generator#initialize): ensured to stop @loop_thread. Mr. Tanaka pointed out one Thread.pass is not enough. [ruby-dev:28185] Fri Dec 30 12:20:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> - * lib/generator.rb: (Generator#initialize) fixed dead lock. this occured + * lib/generator.rb (Generator#initialize): fixed dead lock. this occured when end? was called before @loop_thread was stopped. [ruby-core:7029] Fri Dec 30 01:04:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index f75e3ca561..192e6c46c1 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -115,15 +115,14 @@ rb_syck_compile(self, port) oid = syck_parse( parser ); syck_lookup_sym( parser, oid, (char **)&sav ); - bc = rb_str_new(0, strlen( sav->buffer ) + 3); - ret = RSTRING(bc)->ptr; + ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 ); ret[0] = '\0'; strcat( ret, "D\n" ); strcat( ret, sav->buffer ); syck_free_parser( parser ); - rb_str_resize( bc, strlen(ret) ); + bc = rb_str_new2( ret ); if ( taint ) OBJ_TAINT( bc ); return bc; } @@ -1039,17 +1038,16 @@ syck_resolver_node_import( self, node ) */ VALUE syck_set_ivars( vars, obj ) - VALUE vars, obj; + VALUE vars, obj; { VALUE ivname = rb_ary_entry( vars, 0 ); char *ivn; - ID ivns; StringValue( ivname ); - ivn = S_ALLOC_N( char, RSTRING(ivname)->len + 2 ); - snprintf(ivn, RSTRING(ivname)->len + 1, "@%s", RSTRING(ivname)->ptr); - ivns = rb_intern(ivn); - S_FREE( ivn ); - rb_ivar_set( obj, ivns, rb_ary_entry( vars, 1 ) ); + ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 ); + ivn[0] = '@'; + ivn[1] = '\0'; + strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len ); + rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) ); return Qnil; } |