1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

matz

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-08-15 09:04:32 +00:00
parent 740a664bc8
commit 82178a5529
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Aug 15 17:30:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (frame_dup): should set flag FRAME_MALLOC after
argv allocation.
* eval.c (blk_free): should not free argv if GC was called before
frame_dup.
Tue Aug 15 16:08:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp> Tue Aug 15 16:08:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* configure.in: add ac_cv_func_times=yes for mingw32. * configure.in: add ac_cv_func_times=yes for mingw32.

4
env.h
View File

@ -25,10 +25,14 @@ extern struct FRAME {
char *file; char *file;
int line; int line;
int iter; int iter;
int flags;
} *ruby_frame; } *ruby_frame;
void rb_gc_mark_frame _((struct FRAME *)); void rb_gc_mark_frame _((struct FRAME *));
#define FRAME_ALLOCA 0
#define FRAME_MALLOC 1
extern struct SCOPE { extern struct SCOPE {
struct RBasic super; struct RBasic super;
ID *local_tbl; ID *local_tbl;

6
eval.c
View File

@ -505,6 +505,7 @@ static struct SCOPE *top_scope;
_frame.cbase = ruby_frame->cbase; \ _frame.cbase = ruby_frame->cbase; \
_frame.argc = 0; \ _frame.argc = 0; \
_frame.argv = 0; \ _frame.argv = 0; \
_frame.flags = FRAME_ALLOCA; \
ruby_frame = &_frame; \ ruby_frame = &_frame; \
#define POP_FRAME() \ #define POP_FRAME() \
@ -5682,7 +5683,7 @@ blk_free(data)
frame = data->frame.prev; frame = data->frame.prev;
while (frame) { while (frame) {
if (frame->argc > 0) if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
free(frame->argv); free(frame->argv);
tmp = frame; tmp = frame;
frame = frame->prev; frame = frame->prev;
@ -5728,6 +5729,7 @@ frame_dup(frame)
argv = ALLOC_N(VALUE, frame->argc); argv = ALLOC_N(VALUE, frame->argc);
MEMCPY(argv, frame->argv, VALUE, frame->argc); MEMCPY(argv, frame->argv, VALUE, frame->argc);
frame->argv = argv; frame->argv = argv;
frame->flags = FRAME_MALLOC;
} }
frame->tmp = 0; /* should not preserve tmp */ frame->tmp = 0; /* should not preserve tmp */
if (!frame->prev) break; if (!frame->prev) break;
@ -7781,7 +7783,7 @@ rb_thread_status(thread)
rb_thread_t th = rb_thread_check(thread); rb_thread_t th = rb_thread_check(thread);
if (rb_thread_dead(th)) { if (rb_thread_dead(th)) {
if (NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
return Qnil; return Qnil;
return Qfalse; return Qfalse;
} }

1
lib/net/ftp.rb
View File

@ -216,6 +216,7 @@ module Net
raise FTPReplyError, resp raise FTPReplyError, resp
end end
conn = sock.accept conn = sock.accept
sock.close
end end
return conn return conn
end end