quinn-os/my-basic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fixed a memory leak with variable arguments.

Browse Source
This commit is contained in:
Wang Renxin 2016-06-23 11:47:48 +08:00 committed by GitHub
parent 328f17d4cb
commit c69e679ea5
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/my_basic.c
View File

@ -1660,7 +1660,7 @@ static _running_context_t* _push_scope_by_routine(mb_interpreter_t* s, _running_
static void _destroy_scope(mb_interpreter_t* s, _running_context_t* p); static void _destroy_scope(mb_interpreter_t* s, _running_context_t* p);
static _running_context_t* _pop_weak_scope(mb_interpreter_t* s, _running_context_t* p); static _running_context_t* _pop_weak_scope(mb_interpreter_t* s, _running_context_t* p);
static _running_context_t* _pop_scope(mb_interpreter_t* s, bool_t tidy); static _running_context_t* _pop_scope(mb_interpreter_t* s, bool_t tidy);
static void _out_of_scope(mb_interpreter_t* s, _running_context_t* running, void* instance, bool_t lose); static void _out_of_scope(mb_interpreter_t* s, _running_context_t* running, void* instance, _routine_t* routine, bool_t lose);
static _running_context_t* _find_scope(mb_interpreter_t* s, _running_context_t* p); static _running_context_t* _find_scope(mb_interpreter_t* s, _running_context_t* p);
static _running_context_t* _get_root_scope(_running_context_t* scope); static _running_context_t* _get_root_scope(_running_context_t* scope);
#ifdef MB_ENABLE_LAMBDA #ifdef MB_ENABLE_LAMBDA
@ -4088,9 +4088,9 @@ static int _eval_script_routine(mb_interpreter_t* s, _ls_node_t** l, mb_value_t*
} while(ast); } while(ast);
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
_out_of_scope(s, running, r->instance, true); _out_of_scope(s, running, r->instance, r, true);
#else /* MB_ENABLE_CLASS */ #else /* MB_ENABLE_CLASS */
_out_of_scope(s, running, 0, true); _out_of_scope(s, running, 0, r, true);
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
result = _proc_args(s, l, running, 0, 0, r, 0, 0, false, 0); result = _proc_args(s, l, running, 0, 0, r, 0, 0, false, 0);
@ -4194,7 +4194,7 @@ static int _eval_lambda_routine(mb_interpreter_t* s, _ls_node_t** l, mb_value_t*
} }
} while(ast); } while(ast);
_out_of_scope(s, running, 0, true); _out_of_scope(s, running, 0, r, true);
result = _proc_args(s, l, running, 0, 0, r, 0, 0, false, 0); result = _proc_args(s, l, running, 0, 0, r, 0, 0, false, 0);
if(result != MB_FUNC_OK) if(result != MB_FUNC_OK)
@ -7245,7 +7245,7 @@ static void _unref_class(_ref_t* ref, void* data) {
mb_assert(ref); mb_assert(ref);
if(ref->s->valid) if(ref->s->valid)
_out_of_scope(ref->s, ((_class_t*)data)->scope, (_class_t*)data, false); _out_of_scope(ref->s, ((_class_t*)data)->scope, (_class_t*)data, 0, false);
if(*ref->count == _NONE_REF) if(*ref->count == _NONE_REF)
_destroy_class((_class_t*)data); _destroy_class((_class_t*)data);
@ -8255,16 +8255,17 @@ static _running_context_t* _pop_scope(mb_interpreter_t* s, bool_t tidy) {
if(running->meta == _SCOPE_META_REF) if(running->meta == _SCOPE_META_REF)
_destroy_scope(s, running); _destroy_scope(s, running);
else if(tidy) else if(tidy)
_out_of_scope(s, running, 0, true); _out_of_scope(s, running, 0, 0, true);
return s->running_context; return s->running_context;
} }
/* Out of current scope */ /* Out of current scope */
static void _out_of_scope(mb_interpreter_t* s, _running_context_t* running, void* instance, bool_t lose) { static void _out_of_scope(mb_interpreter_t* s, _running_context_t* running, void* instance, _routine_t* routine, bool_t lose) {
#ifdef MB_ENABLE_LAMBDA #ifdef MB_ENABLE_LAMBDA
_upvalue_scope_tuple_t tuple; _upvalue_scope_tuple_t tuple;
#endif /* MB_ENABLE_LAMBDA */ #endif /* MB_ENABLE_LAMBDA */
mb_unrefvar(routine);
mb_assert(s); mb_assert(s);
@ -8289,8 +8290,10 @@ static void _out_of_scope(mb_interpreter_t* s, _running_context_t* running, void
mb_unrefvar(instance); mb_unrefvar(instance);
#endif /* MB_ENABLE_LAMBDA */ #endif /* MB_ENABLE_LAMBDA */
if(lose && running->var_dict) if(lose) {
_ht_foreach(running->var_dict, _lose_object); if(running->var_dict)
_ht_foreach(running->var_dict, _lose_object);
}
} }
/* Find a scope in a scope chain */ /* Find a scope in a scope chain */
@ -14075,6 +14078,7 @@ static int _core_args(mb_interpreter_t* s, void** l) {
mb_make_nil(arg); mb_make_nil(arg);
_internal_object_to_public_value(obj, &arg); _internal_object_to_public_value(obj, &arg);
mb_check(mb_push_value(s, l, arg)); mb_check(mb_push_value(s, l, arg));
_UNREF(obj);
pushed = true; pushed = true;
_destroy_object_capsule_only(obj, 0); _destroy_object_capsule_only(obj, 0);
} }