March 2010 - macruby-changes - lists.macosforge.org

[3779] MacRuby/trunk/pack.c
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3779 http://trac.macosforge.org/projects/ruby/changeset/3779 Author: lsansonetti(a)apple.com Date: 2010-03-16 17:26:47 -0700 (Tue, 16 Mar 2010) Log Message: ----------- #pack: fixed tainting of resulted string Modified Paths: -------------- MacRuby/trunk/pack.c Modified: MacRuby/trunk/pack.c =================================================================== --- MacRuby/trunk/pack.c 2010-03-17 00:26:14 UTC (rev 3778) +++ MacRuby/trunk/pack.c 2010-03-17 00:26:47 UTC (rev 3779) @@ -1019,7 +1019,7 @@ OBJ_TAINT(data); } else { - for (long i = 0; i < items; i++) { + for (long i = 0, count = RARRAY_LEN(ary); i < count; i++) { if (OBJ_TAINTED(RARRAY_AT(ary, i))) { OBJ_TAINT(data); break;

1 0

[3778] MacRuby/trunk/lib/rexml/encodings/UTF-16.rb
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3778 http://trac.macosforge.org/projects/ruby/changeset/3778 Author: lsansonetti(a)apple.com Date: 2010-03-16 17:26:14 -0700 (Tue, 16 Mar 2010) Log Message: ----------- comment stupid regexp in stupid code Modified Paths: -------------- MacRuby/trunk/lib/rexml/encodings/UTF-16.rb Modified: MacRuby/trunk/lib/rexml/encodings/UTF-16.rb =================================================================== --- MacRuby/trunk/lib/rexml/encodings/UTF-16.rb 2010-03-17 00:03:46 UTC (rev 3777) +++ MacRuby/trunk/lib/rexml/encodings/UTF-16.rb 2010-03-17 00:26:14 UTC (rev 3778) @@ -16,7 +16,8 @@ end def decode_utf16(str) - str = str[2..-1] if /^\376\377/n =~ str + # XXX macruby cannot compile this regexp + #str = str[2..-1] if /^\376\377/n =~ str array_enc=str.unpack('C*') array_utf8 = [] 0.step(array_enc.size-1, 2){|i|

1 0

[3777] MacRuby/trunk/object.c
by source_changes＠macosforge.org 17 Mar '10

17 Mar '10

Revision: 3777 http://trac.macosforge.org/projects/ruby/changeset/3777 Author: martinlagardette(a)apple.com Date: 2010-03-16 17:03:46 -0700 (Tue, 16 Mar 2010) Log Message: ----------- Remove #__native__? (debug method) - Fixes 7692646 Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-03-16 23:51:55 UTC (rev 3776) +++ MacRuby/trunk/object.c 2010-03-17 00:03:46 UTC (rev 3777) @@ -2894,12 +2894,6 @@ } static VALUE -rb_obj_is_native(VALUE recv, SEL sel) -{ - return NATIVE(recv) ? Qtrue : Qfalse; -} - -static VALUE rb_class_is_meta(VALUE klass, SEL sel) { return RCLASS_META(klass) ? Qtrue : Qfalse; @@ -3096,8 +3090,6 @@ rb_objc_define_method(rb_mKernel, "is_a?", rb_obj_is_kind_of_imp, 1); rb_objc_define_method(rb_mKernel, "tap", rb_obj_tap, 0); - rb_objc_define_method(rb_mKernel, "__native__?", rb_obj_is_native, 0); - rb_objc_define_module_function(rb_mKernel, "sprintf", rb_f_sprintf_imp, -1); /* in sprintf.c */ rb_objc_define_module_function(rb_mKernel, "format", rb_f_sprintf_imp, -1); /* in sprintf.c */

1 0

[3776] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3776 http://trac.macosforge.org/projects/ruby/changeset/3776 Author: martinlagardette(a)apple.com Date: 2010-03-16 16:51:55 -0700 (Tue, 16 Mar 2010) Log Message: ----------- Use `GC_RETAIN` instead of `rb_gc_register_address` in `rb_register_mark_object` - Fixes 7692447 Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-03-16 23:07:41 UTC (rev 3775) +++ MacRuby/trunk/gc.c 2010-03-16 23:51:55 UTC (rev 3776) @@ -312,7 +312,7 @@ void rb_register_mark_object(VALUE obj) { - rb_gc_register_address(&obj); + GC_RETAIN(obj); } void

1 0

[3775] MacRuby/trunk/array.c
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3775 http://trac.macosforge.org/projects/ruby/changeset/3775 Author: martinlagardette(a)apple.com Date: 2010-03-16 16:07:41 -0700 (Tue, 16 Mar 2010) Log Message: ----------- #rindex: don't lookup param in an empty array - Fixes 7692217 Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-03-16 22:41:08 UTC (rev 3774) +++ MacRuby/trunk/array.c 2010-03-16 23:07:41 UTC (rev 3775) @@ -896,10 +896,12 @@ else { VALUE val; rb_scan_args(argc, argv, "01", &val); - - size_t pos = rary_rindex_of_item(ary, RARY(ary)->len - 1, val); - if (pos != NOT_FOUND) { - return LONG2NUM(pos); + + if (RARY(ary)->len > 0) { + size_t pos = rary_rindex_of_item(ary, RARY(ary)->len - 1, val); + if (pos != NOT_FOUND) { + return LONG2NUM(pos); + } } } return Qnil;

1 0

[3774] MacRuby/trunk/enumerator.c
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3774 http://trac.macosforge.org/projects/ruby/changeset/3774 Author: martinlagardette(a)apple.com Date: 2010-03-16 15:41:08 -0700 (Tue, 16 Mar 2010) Log Message: ----------- Make sure #to_enum verify param is a symbol - Fixes 7686649 Modified Paths: -------------- MacRuby/trunk/enumerator.c Modified: MacRuby/trunk/enumerator.c =================================================================== --- MacRuby/trunk/enumerator.c 2010-03-16 22:04:35 UTC (rev 3773) +++ MacRuby/trunk/enumerator.c 2010-03-16 22:41:08 UTC (rev 3774) @@ -83,7 +83,7 @@ meth = *argv++; } - ID meth_id = SYM2ID(meth); + ID meth_id = rb_to_id(meth); SEL enum_sel; if (argc > 0) { char buf[100];

1 0

[3773] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3773 http://trac.macosforge.org/projects/ruby/changeset/3773 Author: martinlagardette(a)apple.com Date: 2010-03-16 15:04:35 -0700 (Tue, 16 Mar 2010) Log Message: ----------- Avoid buffer overflow in helper_sel - Make sure we do not write more than allocated in the static buffer by checking the size of the selector. Return (SEL)0 (aka "no helper selector found") if the selector len is too big. - Fixes 7682623 Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-03-16 20:46:19 UTC (rev 3772) +++ MacRuby/trunk/dispatcher.cpp 2010-03-16 22:04:35 UTC (rev 3773) @@ -194,7 +194,11 @@ SEL new_sel = 0; char buf[100]; - assert(len < sizeof(buf)); + // Avoid buffer overflow + // len + "sel" + ':' + '\0' + if ((len + 5) > sizeof(buf)) { + return (SEL)0; + } if (len >= 3 && isalpha(p[len - 3]) && p[len - 2] == '=' && p[len - 1] == ':') {

1 0

[3772] MacRuby/trunk/ext/openssl/ossl_rand.c
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3772 http://trac.macosforge.org/projects/ruby/changeset/3772 Author: lsansonetti(a)apple.com Date: 2010-03-16 13:46:19 -0700 (Tue, 16 Mar 2010) Log Message: ----------- fixed a crasher Modified Paths: -------------- MacRuby/trunk/ext/openssl/ossl_rand.c Modified: MacRuby/trunk/ext/openssl/ossl_rand.c =================================================================== --- MacRuby/trunk/ext/openssl/ossl_rand.c 2010-03-16 20:36:23 UTC (rev 3771) +++ MacRuby/trunk/ext/openssl/ossl_rand.c 2010-03-16 20:46:19 UTC (rev 3772) @@ -98,8 +98,13 @@ VALUE str; int n = NUM2INT(len); - str = rb_str_new(0, n); - if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) { + if (n <= 0) { + rb_raise(rb_eArgError, "given length should be greater than 0"); + } + + str = rb_bstr_new(); + rb_bstr_resize(str, n); + if (!RAND_bytes(rb_bstr_bytes(str), n)) { ossl_raise(eRandomError, NULL); }

1 0

[3771] MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack_tags.txt
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3771 http://trac.macosforge.org/projects/ruby/changeset/3771 Author: lsansonetti(a)apple.com Date: 2010-03-16 13:36:23 -0700 (Tue, 16 Mar 2010) Log Message: ----------- tag specs that fail (because #pack does not return proper string encodings) Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack_tags.txt 2010-03-16 20:14:02 UTC (rev 3770) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack_tags.txt 2010-03-16 20:36:23 UTC (rev 3771) @@ -14,3 +14,15 @@ fails:Array#pack with format 'n' does not raise a RangeError even when a pack argument is >= 2**64 fails:Array#pack just ignores unknown format fails:Array#pack with format 'n' does not raise a RangeError even when a pack argument is >= 2**64 +fails:Array#pack with format 'A' treats a multibyte character just as a byte sequence +fails:Array#pack with format 'A' returns result in ASCII-8BIT +fails:Array#pack with format 'a' treats a multibyte character just as a byte sequence +fails:Array#pack with format 'a' returns result in ASCII-8BIT +fails:Array#pack with format 'Z' treats a multibyte character just as a byte sequence +fails:Array#pack with format 'Z' returns result in ASCII-8BIT +fails:Array#pack with the empty format returns an empty String in US-ASCII +fails:Array#pack with format 'M' returns an US-ASCII string +fails:Array#pack with format 'm' returns an US-ASCII string +fails:Array#pack with format 'U' regards a integer as a Unicode codepoint and encodes into UTF-8 byte sequence +fails:Array#pack with format 'u' returns an US-ASCII string +fails:Array#pack with format 'x' returns an US-ASCII string

1 0

[3770] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3770 http://trac.macosforge.org/projects/ruby/changeset/3770 Author: lsansonetti(a)apple.com Date: 2010-03-16 13:14:02 -0700 (Tue, 16 Mar 2010) Log Message: ----------- compile strings as utf8-style buffers and not unichar buffers Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-03-16 03:08:19 UTC (rev 3769) +++ MacRuby/trunk/compiler.cpp 2010-03-16 20:14:02 UTC (rev 3770) @@ -2807,21 +2807,14 @@ return CallInst::Create(newString3Func, "", bb); } else { - UChar *chars = NULL; - long chars_len = 0; - bool need_free = false; + const char *cstr = RSTRING_PTR(val); + const int cstr_len = RSTRING_LEN(val); - rb_str_get_uchars(val, &chars, &chars_len, &need_free); - assert(chars_len > 0); + assert(cstr_len > 0); - GlobalVariable *str_gvar = compile_const_global_ustring(chars, - chars_len); + GlobalVariable *str_gvar = compile_const_global_string(cstr, + cstr_len); - if (need_free) { - free(chars); - chars = NULL; - } - std::vector<Value *> idxs; idxs.push_back(ConstantInt::get(Int32Ty, 0)); idxs.push_back(ConstantInt::get(Int32Ty, 0)); @@ -2831,14 +2824,13 @@ if (newString2Func == NULL) { newString2Func = cast<Function>( module->getOrInsertFunction( - "rb_unicode_str_new", - RubyObjTy, PointerType::getUnqual(Int16Ty), - Int32Ty, NULL)); + "rb_str_new", + RubyObjTy, PtrTy, Int32Ty, NULL)); } std::vector<Value *> params; params.push_back(load); - params.push_back(ConstantInt::get(Int32Ty, chars_len)); + params.push_back(ConstantInt::get(Int32Ty, cstr_len)); return CallInst::Create(newString2Func, params.begin(), params.end(), "", bb);

1 0