Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-21 12:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak of chunked_array2d

Browse Source
This commit is contained in:
blueloveTH 2025-04-13 14:27:19 +08:00
parent efa60ec5cc
commit c7dbb8bd7f
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sh
View File

@ -16,10 +16,11 @@ if [ $? -ne 0 ]; then
fi fi
SRC=$(find src/ -name "*.c") SRC=$(find src/ -name "*.c")
SRC2=${1:-src2/main.c}
echo "> Compiling and linking source files... " echo "> Compiling and linking source files... "
clang -std=c11 -O2 -Wfatal-errors -Iinclude -DNDEBUG -o main src2/main.c $SRC -lm -ldl clang -std=c11 -O2 -Wfatal-errors -Iinclude -DNDEBUG -o main $SRC $SRC2 -lm -ldl
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Build completed. Type \"./main\" to enter REPL." echo "Build completed. Type \"./main\" to enter REPL."

6
build_g.sh
View File

@ -12,6 +12,8 @@ if [ "$(uname)" == "Darwin" ]; then
SANITIZE_FLAGS="-fsanitize=address,undefined" SANITIZE_FLAGS="-fsanitize=address,undefined"
fi fi
echo "Compiling C files..." SRC2=${1:-src2/main.c}
clang $FLAGS $SANITIZE_FLAGS $SRC src2/main.c -o main
echo "Compiling C files..."
clang $FLAGS $SANITIZE_FLAGS $SRC $SRC2 -o main

2
include/pocketpy/objects/base.h
View File

@ -4,7 +4,7 @@
typedef struct PyObject PyObject; typedef struct PyObject PyObject;
typedef struct VM VM; typedef struct VM VM;
extern VM* pk_current_vm; extern _Thread_local VM* pk_current_vm;
typedef struct py_TValue { typedef struct py_TValue {
py_Type type; py_Type type;

19
src/modules/array2d.c
View File

@ -909,7 +909,10 @@ static py_TValue* c11_chunked_array2d__new_chunk(c11_chunked_array2d* self, c11_
if(!py_isnone(&self->context_builder)) { if(!py_isnone(&self->context_builder)) {
py_newvec2i(&data[0], pos); py_newvec2i(&data[0], pos);
bool ok = py_call(&self->context_builder, 1, &data[0]); bool ok = py_call(&self->context_builder, 1, &data[0]);
if(!ok) return NULL; if(!ok) {
PK_FREE(data);
return NULL;
}
data[0] = *py_retval(); data[0] = *py_retval();
} else { } else {
data[0] = *py_None(); data[0] = *py_None();
@ -1103,6 +1106,7 @@ static bool chunked_array2d__len__(int argc, py_Ref argv) {
static bool chunked_array2d_clear(int argc, py_Ref argv) { static bool chunked_array2d_clear(int argc, py_Ref argv) {
PY_CHECK_ARGC(1); PY_CHECK_ARGC(1);
c11_chunked_array2d* self = py_touserdata(argv); c11_chunked_array2d* self = py_touserdata(argv);
c11__foreach(c11_chunked_array2d_chunks_KV, &self->chunks, p_kv) PK_FREE(p_kv->value);
c11_chunked_array2d_chunks__clear(&self->chunks); c11_chunked_array2d_chunks__clear(&self->chunks);
self->last_visited.value = NULL; self->last_visited.value = NULL;
py_newnone(py_retval()); py_newnone(py_retval());
@ -1166,9 +1170,16 @@ static bool chunked_array2d_remove_chunk(int argc, py_Ref argv) {
PY_CHECK_ARG_TYPE(1, tp_vec2i); PY_CHECK_ARG_TYPE(1, tp_vec2i);
c11_chunked_array2d* self = py_touserdata(argv); c11_chunked_array2d* self = py_touserdata(argv);
c11_vec2i pos = py_tovec2i(&argv[1]); c11_vec2i pos = py_tovec2i(&argv[1]);
bool ok = c11_chunked_array2d_chunks__del(&self->chunks, pos); py_TValue* data = c11_chunked_array2d_chunks__get(&self->chunks, pos, NULL);
self->last_visited.value = NULL; if(data != NULL) {
py_newbool(py_retval(), ok); PK_FREE(data);
bool ok = c11_chunked_array2d_chunks__del(&self->chunks, pos);
assert(ok);
self->last_visited.value = NULL;
py_newbool(py_retval(), ok);
} else {
py_newbool(py_retval(), false);
}
return true; return true;
} }

7
src/public/internal.c
View File

@ -5,14 +5,15 @@
#include "pocketpy/common/utils.h" #include "pocketpy/common/utils.h"
#include "pocketpy/interpreter/vm.h" #include "pocketpy/interpreter/vm.h"
VM* pk_current_vm; _Thread_local VM* pk_current_vm;
static bool pk_initialized;
static VM pk_default_vm; static VM pk_default_vm;
static VM* pk_all_vm[16]; static VM* pk_all_vm[16];
static py_TValue _True, _False, _None, _NIL; static py_TValue _True, _False, _None, _NIL;
void py_initialize() { void py_initialize() {
if(pk_current_vm) { if(pk_initialized) {
// c11__abort("py_initialize() can only be called once!"); // c11__abort("py_initialize() can only be called once!");
return; return;
} }
@ -35,6 +36,8 @@ void py_initialize() {
py_newnone(&_None); py_newnone(&_None);
py_newnil(&_NIL); py_newnil(&_NIL);
VM__ctor(&pk_default_vm); VM__ctor(&pk_default_vm);
pk_initialized = true;
} }
py_GlobalRef py_True() { return &_True; } py_GlobalRef py_True() { return &_True; }