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 memory leak when str(String('test'))

Browse Source
This commit is contained in:
lyon 2022-06-01 15:12:35 +08:00
parent 19a0b52ea3
commit 64391b3333
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
port/linux/test/pikaMain-test.cpp
View File

@ -2149,17 +2149,17 @@ TEST(pikaMain, list_for_append) {
EXPECT_EQ(pikaMemNow(), 0);
}
// TEST(pikaMain, string_str) {
// /* init */
// pikaMemInfo.heapUsedMax = 0;
// /* run */
// PikaObj* self = newRootObj("pikaMain", New_PikaMain);
// __platform_printf("BEGIN\r\n");
// obj_run(self, "a = str(PikaStdData.String('test'))\n");
// /* assert */
// EXPECT_STREQ(log_buff[0], "test\r\n");
// EXPECT_STREQ(log_buff[1], "BEGIN\r\n");
// /* deinit */
// obj_deinit(self);
// EXPECT_EQ(pikaMemNow(), 0);
// }
TEST(pikaMain, string_str) {
/* init */
pikaMemInfo.heapUsedMax = 0;
/* run */
PikaObj* self = newRootObj("pikaMain", New_PikaMain);
__platform_printf("BEGIN\r\n");
obj_run(self, "str(PikaStdData.String('test'))\n");
/* assert */
EXPECT_STREQ(log_buff[0], "test\r\n");
EXPECT_STREQ(log_buff[1], "BEGIN\r\n");
/* deinit */
obj_deinit(self);
EXPECT_EQ(pikaMemNow(), 0);
}

20
src/PikaVM.c
View File

@ -177,10 +177,6 @@ static Arg* VM_instruction_handler_REF(PikaObj* self, VMState* vs, char* data) {
/* find in global list second */
arg = arg_copy(obj_getArg(vs->globals, data));
}
ArgType arg_type = arg_getType(arg);
if (ARG_TYPE_OBJECT == arg_type) {
arg = arg_setType(arg, ARG_TYPE_OBJECT);
}
if (NULL == arg) {
VMState_setErrorCode(vs, 1);
__platform_printf("NameError: name '%s' is not defined\r\n", data);
@ -373,11 +369,12 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self, VMState* vs, char* data) {
/* __init__() */
if (ARG_TYPE_OBJECT_NEW == arg_getType(return_arg)) {
arg_setType(return_arg, ARG_TYPE_OBJECT);
/* init object */
PikaObj* new_obj = arg_getPtr(return_arg);
Arg* method_arg = obj_getMethodArg(new_obj, "__init__");
PikaObj* sub_locals = New_PikaObj();
Arg* return_arg = NULL;
Arg* return_arg_init = NULL;
if (NULL == method_arg) {
uint16_t arg_input_num = VMState_getInputArgNum(vs);
if (arg_input_num != 0) {
@ -397,10 +394,11 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self, VMState* vs, char* data) {
if (vs->error_code != 0) {
goto init_exit;
}
return_arg = VMState_runMethodArg(vs, new_obj, sub_locals, method_arg);
return_arg_init =
VMState_runMethodArg(vs, new_obj, sub_locals, method_arg);
init_exit:
if (NULL != return_arg) {
arg_deinit(return_arg);
if (NULL != return_arg_init) {
arg_deinit(return_arg_init);
}
obj_deinit(sub_locals);
arg_deinit(method_arg);
@ -1394,10 +1392,8 @@ void VMState_solveUnusedStack(VMState* vs) {
arg_deinit(arg);
continue;
}
if (ARG_TYPE_OBJECT_NEW == type) {
obj_deinit(arg_getPtr(arg));
arg_deinit(arg);
continue;
if (argType_isObject(type)) {
__platform_printf("<object at 0x%02x>\r\n", (uintptr_t)arg_getPtr(arg));
}
if (type == ARG_TYPE_INT) {
__platform_printf("%d\r\n", (int)arg_getInt(arg));

3
src/dataStack.c
View File

@ -114,8 +114,9 @@ Arg* stack_popArg(Stack* stack) {
stack->top--;
int16_t size = stack_popSize(stack);
Arg* arg = arg_copy((Arg*)stack_popPyload(stack, size));
ArgType type = arg_getType(arg);
/* decrase ref_cnt */
if (argType_isObject(arg_getType(arg))) {
if (argType_isObject(type)) {
obj_refcntDec(arg_getPtr(arg));
}
return arg;