mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* signal.c (sighandle): should not re-register sighandler if
POSIX_SIGNAL is defined. * eval.c (error_print): errat array may be empty. * eval.c (rb_eval_cmd): should not upgrade safe level unless explicitly specified by argument newly added. * signal.c (sig_trap): should not allow tainted trap closure. * variable.c (rb_f_trace_var): should not allow trace_var on safe level higher than 3. * variable.c (rb_f_trace_var): should not allow tainted trace closure. * gc.c: do not use static stack until system stack overflows. * eval.c (eval): should call Exception#exception instead of calling rb_exc_new3() directly. * error.c (exc_exception): set "mesg" directly to the clone. it might be better to set mesg via some method for flexibility. * variable.c (cvar_override_check): should print original module name, if 'a' is T_ICLASS. * parse.y (yylex): float '1_.0' should not be allowed. * variable.c (var_getter): should care about var as Qfalse (ruby-bugs#PR199). * array.c (cmpint): <=> or block for {min,max} may return bignum. * array.c (sort_1): use rb_compint. * array.c (sort_2): ditto. * enum.c (min_ii): ditto. * enum.c (min_ii): ditto. * enum.c (max_i): ditto. * enum.c (max_ii): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
90ff4f01ab
commit
948ff2456b
5 changed files with 41 additions and 23 deletions
|
@ -361,8 +361,8 @@ freeDevice()
|
|||
|
||||
/* ruby function: getpty */
|
||||
static VALUE
|
||||
pty_getpty(self, shell)
|
||||
VALUE self, shell;
|
||||
pty_getpty(self, command)
|
||||
VALUE self, command;
|
||||
{
|
||||
VALUE res, th;
|
||||
struct pty_info info;
|
||||
|
@ -373,15 +373,19 @@ pty_getpty(self, shell)
|
|||
MakeOpenFile(rport, rfptr);
|
||||
MakeOpenFile(wport, wfptr);
|
||||
|
||||
establishShell(RSTRING(shell)->ptr,&info);
|
||||
if (TYPE(command) == T_ARRAY)
|
||||
command = rb_ary_join(command,rb_str_new2(" "));
|
||||
Check_SafeStr(command);
|
||||
|
||||
establishShell(RSTRING(command)->ptr,&info);
|
||||
|
||||
rfptr->mode = rb_io_mode_flags("r");
|
||||
rfptr->f = fdopen(info.fd, "r");
|
||||
rfptr->path = strdup(RSTRING(shell)->ptr);
|
||||
rfptr->path = strdup(RSTRING(command)->ptr);
|
||||
|
||||
wfptr->mode = rb_io_mode_flags("w");
|
||||
wfptr->f = fdopen(dup(info.fd), "w");
|
||||
wfptr->path = strdup(RSTRING(shell)->ptr);
|
||||
wfptr->path = strdup(RSTRING(command)->ptr);
|
||||
|
||||
res = rb_ary_new2(3);
|
||||
rb_ary_store(res,0,(VALUE)rport);
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
alias $ERROR_INFO $!
|
||||
alias $ERROR_POSITION $@
|
||||
alias $LOADED_FEATURES $"
|
||||
|
|
|
@ -81,7 +81,7 @@ class CGI
|
|||
unless @data
|
||||
@data = @dbman.restore
|
||||
end
|
||||
@data[key] = String(val)
|
||||
@data[key] = val
|
||||
end
|
||||
|
||||
def update
|
||||
|
@ -139,7 +139,7 @@ class CGI
|
|||
def update
|
||||
@f.rewind
|
||||
for k,v in @hash
|
||||
@f.printf "%s=%s\n", CGI::escape(k), CGI::escape(v)
|
||||
@f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
|
||||
end
|
||||
@f.truncate @f.tell
|
||||
end
|
||||
|
|
|
@ -29,17 +29,21 @@ class Delegator
|
|||
end
|
||||
for method in obj.methods
|
||||
next if preserved.include? method
|
||||
eval <<-EOS
|
||||
def self.#{method}(*args, &block)
|
||||
begin
|
||||
__getobj__.__send__(:#{method}, *args, &block)
|
||||
rescue Exception
|
||||
$@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
|
||||
$@.delete_if{|s| /^\\(eval\\):/ =~ s}
|
||||
raise
|
||||
begin
|
||||
eval <<-EOS
|
||||
def self.#{method}(*args, &block)
|
||||
begin
|
||||
__getobj__.__send__(:#{method}, *args, &block)
|
||||
rescue Exception
|
||||
$@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
|
||||
$@.delete_if{|s| /^\\(eval\\):/ =~ s}
|
||||
raise
|
||||
end
|
||||
end
|
||||
end
|
||||
EOS
|
||||
EOS
|
||||
rescue SyntaxError
|
||||
raise NameError, "invalid identifier %s" % method, caller(4)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -81,8 +85,9 @@ def DelegateClass(superclass)
|
|||
end
|
||||
EOS
|
||||
for method in methods
|
||||
klass.module_eval <<-EOS
|
||||
def #{method}(*args, &block)
|
||||
begin
|
||||
klass.module_eval <<-EOS
|
||||
def #{method}(*args, &block)
|
||||
begin
|
||||
@obj.__send__(:#{method}, *args, &block)
|
||||
rescue
|
||||
|
@ -90,10 +95,13 @@ def DelegateClass(superclass)
|
|||
raise
|
||||
end
|
||||
end
|
||||
EOS
|
||||
end
|
||||
return klass;
|
||||
EOS
|
||||
rescue SyntaxError
|
||||
raise NameError, "invalid identifier %s" % method, caller(3)
|
||||
end
|
||||
end
|
||||
return klass;
|
||||
end
|
||||
|
||||
if __FILE__ == $0
|
||||
class ExtArray<DelegateClass(Array)
|
||||
|
|
|
@ -1338,6 +1338,13 @@ l=nil
|
|||
100000.times {
|
||||
l = S.new(l)
|
||||
}
|
||||
GC.start
|
||||
test_ok true # reach here or dumps core
|
||||
l = []
|
||||
100000.times {
|
||||
l.push([l])
|
||||
}
|
||||
GC.start
|
||||
test_ok true # reach here or dumps core
|
||||
|
||||
if $failed > 0
|
||||
|
|
Loading…
Reference in a new issue