summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-06-28merge revision(s) 17625:shyouhei
* class.c (clone_method): use rb_copy_node_scope. fixed [ruby-list:45102] fixed [ruby-core:17393] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-28merge revision(s) 16536:shyouhei
* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope and export. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-27merge revision(s) 17025:shyouhei
* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up initialize_copy; [ruby-list:45016], [ruby-list:45018]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-27merge revision(s) 16870:shyouhei
* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int. fixed [ruby-dev:34979] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-27merge revision(s) 16855:shyouhei
* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-27merge revision(s) 16809,16824:shyouhei
* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now allows range. [ruby-core:17092] * ext/iconv/iconv.c (iconv_iconv): fixed backport miss. [ruby-core:17115] * ext/iconv/iconv.c (iconv_iconv): fixed backport miss. [ruby-core:17115] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-24merge revision(s) 16763:shyouhei
* lib/erb.rb (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without strscan problems. [ruby_core:17028]. * test/erb/test_erb.rb (TestERBCoreWOStrScan): Add test class for without strscan. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-21merge revision(s) 16752:shyouhei
* lib/delegate.rb (DelegateClass, Delegator#respond_to?): respond_to? should now take optional second argument; submitted by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-20merge revision(s) 17483:shyouhei
* string.c (rb_str_buf_append): should infect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-20merge revision(s) 17470:17472:shyouhei
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified behavior at integer overflow. * string.c (str_buf_cat): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-19* array.c (ary_new, rb_ary_initialize, rb_ary_store,shyouhei
rb_ary_aplice, rb_ary_times): integer overflows should be checked. based on patches from Drew Yao <ayao at apple.com> fixed CVE-2008-2726 * string.c (rb_str_buf_append): fixed unsafe use of alloca, which led memory corruption. based on a patch from Drew Yao <ayao at apple.com> fixed CVE-2008-2726 * sprintf.c (rb_str_format): backported from trunk. * intern.h: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-19* array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):nobu
Make Array#eql?, #hash, #== and #<=> use rb_protect_inspect() and handle recursive data properly. [ruby-dev:35181] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-19* array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):nobu
Make Array#eql?, #hash, #== and #<=> use rb_exec_recursive() and handle recursive data properly. [ruby-dev:35181] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-18merge revision(s) 17396:shyouhei
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search public methods only. [ruby-core:17283] * object.c (convert_type): ditto. * lib/singleton.rb (Singleton#_dump): conversion method should be public. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-18 * file.c: fixes to compile on mswin32. Patch from U. Nakamurashyouhei
<usa at garbagecollect.jp>. [ruby-dev:35127] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-17merge revision(s) 12205:shyouhei
* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted, it is done by libpathflag in mkmf.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-16merge revision(s) 16514:shyouhei
* proc.c (proc_dup): should copy safe_level from src proc properly. a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16677:shyouhei
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16654:shyouhei
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search private methods too. [ruby-dev:34671] * object.c (convert_type): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16641:shyouhei
* numeric.c (flo_divmod): Revert the behavior change; do not suppress an exception when div is NaN or Inf. [ruby-dev:34857] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16618:shyouhei
* file.c (BUFCHECK): wrong condition. [ruby-core:16921] * file.c (file_expand_buf): shouldn't use buflen for length of string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16596:shyouhei
* marshal.c (r_object0, Init_marshal): Fix the garbled s_call definition; fixes [ruby-dev:34843]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16570:shyouhei
* object.c (rb_cstr_to_dbl): should clear errno before calling strtod(3). [ruby-dev:34834] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16569:shyouhei
* marshal.c (marshal_load): should initialize arg.data used for reentrant check. [ruby-dev:34837] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16564:shyouhei
* marshal.c (reentrant_check): check reentrance via callcc. [ruby-dev:34802] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16534:shyouhei
* parse.y (top_local_setup): fixed memory leak bug based on a patch from Roger Pack <rogerpack2005 at gmail.com> in [ruby-core:16610]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16473:shyouhei
* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16471:shyouhei
* process.c (rb_f_system): set last_status when status == -1 because there is no path to set it on win32. this patch is derived from [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16420,16454:shyouhei
* file.c (file_expand_path): support for alternative data stream and ignored trailing garbages of NTFS. * file.c (rb_file_s_basename): ditto. * file.c (rb_file_s_extname): ditto. * lib/webrick/httpservlet/filehandler.rb: should normalize path name in path_info to prevent script disclosure vulnerability on DOSISH filesystems. (fix: CVE-2008-1891) Note: NTFS/FAT filesystem should not be published by the platforms other than Windows. Pathname interpretation (including short filename) is less than perfect. * lib/webrick/httpservlet/abstract.rb (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri): should escape the value of Location: header. * lib/webrick/httpservlet/cgi_runner.rb: accept interpreter command line arguments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16400:shyouhei
* string.c (rb_str_cat): fixed buffer overrun reported by Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16385:shyouhei
* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}. "defined?(a||=1)" should not operate assignment. [ruby-dev:34645] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16379:shyouhei
* win32/win32.c (rb_w32_select): backport from trunk. [ruby-talk:300743] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16369:shyouhei
* lib/delegate.rb (SimpleDelegator::dup): removed needless argument. [ruby-list:44910] * lib/delegate.rb (clone, dup): keep relationship with the target object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16342:shyouhei
* util.c (ruby_strtod): backported from 1.9. a patch from Satoshi Nakagawa <psychs at limechat.net> in [ruby-dev:34625]. fixed: [ruby-dev:34623] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16307:shyouhei
* struct.c (rb_struct_s_def): to_str should be called only once. [ruby-core:16647] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16305:shyouhei
* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop. a patch from Kouya <kouyataifu4 at gmail.com> in [ruby-reference-manual:762]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16242:shyouhei
Merged 16241 from trunk. * lib/net/telnet.rb: Fixing a bug where line endings would not be properly escaped when the two character ending was broken up into separate TCP packets. Issue reported and patched by Brian Candler. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16239:shyouhei
* re.c (rb_reg_search): use local variable. a patch from wanabe <s.wanabe AT gmail.com> in [ruby-dev:34537]. [ruby-dev:34492] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16177:shyouhei
* dln.c (dln_find_1): prior files with extensions to files sans extensions. [ruby-core:16517] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16144:shyouhei
* sprintf.c (rb_f_sprintf): should protect temporary string from GC. [ruby-dev:34480] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16143:shyouhei
* regex.c (re_search): string might be NULL. [ruby-core:16478] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16114:shyouhei
* time.c (rb_strftime): check errno to detect strftime(3)'s error. this is workaround for recent version of MSVCRT. [ruby-dev:34456] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16082:shyouhei
* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit; merged from 1.9. * lib/yaml.rb (quick_emit): use combination of object_id and hash to identify repeated object references, since GC will reuse memory of objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698]; merged from 1.9. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 16074:shyouhei
* ext/syck/rubyext.c: Node#value defined twice. * lib/yaml/: several method redefinitions causing warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15965:shyouhei
* marshal.c (w_object): add volatile to avoid potential GC bug. a patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp> in [ruby-dev:34311]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15924:shyouhei
* re.c (rb_reg_quote): should always copy the quoting string. [ruby-core:16235] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15900:shyouhei
* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and @n_bytes as well. [ruby-core:16144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15869:shyouhei
* lib/resolv.rb (Resolv::Config.default_config_hash): requires win32/resolv to use Win32::Resolv. [ruby-dev:34138] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15856:shyouhei
* class.c (clone_method): should copy cref as well. [ruby-core:15833] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-15merge revision(s) 15832:shyouhei
* parse.y (yycompile): Always prepare a new array for each file's SCRIPT_LINES__ storage, instead of appending source lines every time a file is re-loaded; submitted by Rocky Bernstein in #18517. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e