Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix mem leak caused by kw pars refcnt err

Browse Source
This commit is contained in:
lyon 2022-12-10 17:10:15 +08:00
parent 853d5be3b5
commit d78aec86dd
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PikaVM.c
View File

@ -861,11 +861,13 @@ static char* _kw_to_default_all(FunctionArgsInfo* f,
if (f->kw != NULL) { if (f->kw != NULL) {
Arg* default_arg = pikaDict_getArg(f->kw, arg_name); Arg* default_arg = pikaDict_getArg(f->kw, arg_name);
if (default_arg != NULL) { if (default_arg != NULL) {
Arg* arg_new = arg_copy(default_arg); PikaObj* obj = NULL;
if (argType_isObject(arg_getType(arg_new))) { if (argType_isObject(arg_getType(default_arg))) {
obj_refcntDec(arg_getPtr(arg_new)); obj = arg_getPtr(default_arg);
} }
Arg* arg_new = arg_copy(default_arg);
argv[(*argc)++] = arg_new; argv[(*argc)++] = arg_new;
pikaDict_removeArg(f->kw, default_arg);
} }
} }
arg_name = strPopLastToken(f->type_list, ','); arg_name = strPopLastToken(f->type_list, ',');
@ -885,6 +887,7 @@ static int _kw_to_pos_one(FunctionArgsInfo* f,
return 0; return 0;
} }
argv[(*argc)++] = arg_copy(pos_arg); argv[(*argc)++] = arg_copy(pos_arg);
pikaDict_removeArg(f->kw, pos_arg);
return 1; return 1;
} }
@ -899,6 +902,7 @@ static void _kw_to_pos_all(FunctionArgsInfo* f, int* argc, Arg* argv[]) {
Arg* pos_arg = pikaDict_getArg(f->kw, arg_name); Arg* pos_arg = pikaDict_getArg(f->kw, arg_name);
pika_assert(pos_arg != NULL); pika_assert(pos_arg != NULL);
argv[(*argc)++] = arg_copy(pos_arg); argv[(*argc)++] = arg_copy(pos_arg);
pikaDict_removeArg(f->kw, pos_arg);
} }
} }
@ -947,6 +951,10 @@ static void _type_list_parse(FunctionArgsInfo* f) {
} }
static void _kw_push(FunctionArgsInfo* f, Arg* call_arg, int i) { static void _kw_push(FunctionArgsInfo* f, Arg* call_arg, int i) {
PikaObj* obj = NULL;
if (argType_isObject(arg_getType(call_arg))) {
obj = arg_getPtr(call_arg);
}
if (NULL == f->kw) { if (NULL == f->kw) {
f->kw = New_pikaDict(); f->kw = New_pikaDict();
} }
@ -1095,7 +1103,7 @@ static int _get_n_input_with_unpack(VMState* vm) {
break; break;
} }
/* unpack as keyword arg */ /* unpack as keyword arg */
arg_setIsKeyword(item_val, 1); arg_setIsKeyword(item_val, PIKA_TRUE);
stack_pushArg(&stack_tmp, arg_copy(item_val)); stack_pushArg(&stack_tmp, arg_copy(item_val));
i_item++; i_item++;
} }
@ -1833,9 +1841,7 @@ static Arg* VM_instruction_handler_OUT(PikaObj* self,
arg_setIsKeyword(out_arg, PIKA_TRUE); arg_setIsKeyword(out_arg, PIKA_TRUE);
arg_setName(out_arg, arg_path); arg_setName(out_arg, arg_path);
Arg* res = arg_copy_noalloc(out_arg, arg_ret_reg); Arg* res = arg_copy_noalloc(out_arg, arg_ret_reg);
if (arg_isSerialized(out_arg)) { arg_deinit(out_arg);
arg_deinit(out_arg);
}
return res; return res;
} }

3
test/VM-test.cpp
View File

@ -1223,7 +1223,7 @@ TEST(VM, issue_I5OJQB) {
TEST(vm, keyword_2) { TEST(vm, keyword_2) {
char* line = char* line =
"def test(a, b):\n" "def test(a, b):\n"
" print(__kwargs['a'], __kwargs['b'])\n" " print(a, b)\n"
"test(a=1, b= 2)"; "test(a=1, b= 2)";
PikaObj* self = newRootObj("root", New_PikaStdLib_SysObj); PikaObj* self = newRootObj("root", New_PikaStdLib_SysObj);
obj_run(self, line); obj_run(self, line);
@ -2399,7 +2399,6 @@ TEST(vm, issue_keyword_mem_leak) {
obj_linkLibrary(pikaMain, pikaModules_py_a); obj_linkLibrary(pikaMain, pikaModules_py_a);
pikaVM_runSingleFile(pikaMain, pikaVM_runSingleFile(pikaMain,
"test/python/issue/issue_keyword_mem_leak.py"); "test/python/issue/issue_keyword_mem_leak.py");
PikaObj* header = (PikaObj*)obj_getPtr(pikaMain, "header");
/* assert */ /* assert */
/* deinit */ /* deinit */
obj_deinit(pikaMain); obj_deinit(pikaMain);

4
test/python/issue/issue_keyword_mem_leak.py
View File

@ -1,7 +1,7 @@
def test(headers=None): def test(headers=None, data=None):
print("in test") print("in test")
header = {"a": "test"} header = {"a": "test"}
test(headers=header) test(headers=header, data={"b": "test"})