diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | pack.c | 13 |
2 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,14 @@ +Tue Jul 18 15:49:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * pack.c (pack_unpack): propagate association array to copied + string. [ruby-core:08223] + + * pack.c (pack_unpack): return referenced string itself if it has + same length as specified. a patch from <nobu at ruby-lang.org> + in [ruby-core:08225]. + + * pack.c (pack_pack): taint 'p' packed strings. + Tue Jul 18 15:19:07 2006 NAKAMURA Usaku <usa@ruby-lang.org> * intern.h (st_foreach_safe): fix prototype. @@ -932,6 +932,7 @@ pack_pack(VALUE ary, VALUE fmt) associates = rb_ary_new(); } rb_ary_push(associates, from); + rb_obj_taint(from); rb_str_buf_cat(res, (char*)&t, sizeof(char*)); } break; @@ -1873,8 +1874,12 @@ pack_unpack(VALUE str, VALUE fmt) pend = p + RARRAY(a)->len; while (p < pend) { if (TYPE(*p) == T_STRING && RSTRING(*p)->ptr == t) { - if (len > RSTRING(*p)->len) { - len = RSTRING(*p)->len; + if (len < RSTRING(*p)->len) { + tmp = rb_tainted_str_new(t, len); + rb_str_associate(tmp, a); + } + else { + tmp = *p; } break; } @@ -1883,7 +1888,6 @@ pack_unpack(VALUE str, VALUE fmt) if (p == pend) { rb_raise(rb_eArgError, "non associated pointer"); } - tmp = rb_tainted_str_new(t, len); } else { tmp = Qnil; @@ -1915,6 +1919,7 @@ pack_unpack(VALUE str, VALUE fmt) pend = p + RARRAY(a)->len; while (p < pend) { if (TYPE(*p) == T_STRING && RSTRING(*p)->ptr == t) { + tmp = *p; break; } p++; @@ -1922,8 +1927,6 @@ pack_unpack(VALUE str, VALUE fmt) if (p == pend) { rb_raise(rb_eArgError, "non associated pointer"); } - tmp = rb_str_new2(t); - OBJ_INFECT(tmp, str); } else { tmp = Qnil; |