fix: refine codes

TEN-framework · Nov 7, 2024 · 21e16bf · 21e16bf
1 parent db8ed53
commit 21e16bf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -143,7 +143,7 @@
       "env": {
         "LD_LIBRARY_PATH": "${workspaceFolder}/out/linux/x64/tests/standalone/",
         "ASAN_OPTIONS": "abort_on_error=1",
-        "TEN_ENABLE_MEMORY_TRACKING": "true"
+        // "TEN_ENABLE_MEMORY_TRACKING": "true"
       },
     },
     {

diff --git a/core/include/ten_utils/lib/string.h b/core/include/ten_utils/lib/string.h
@@ -17,7 +17,7 @@
 #include "ten_utils/macro/check.h"
 
 #define TEN_STRING_SIGNATURE 0x178445C0402E320DU
-#define TEN_STRING_PRE_BUF_SIZE 256
+#define TEN_STRING_PRE_BUF_SIZE 1024
 
 typedef struct ten_list_t ten_list_t;
 

diff --git a/core/src/ten_utils/lib/sys/general/string.c b/core/src/ten_utils/lib/sys/general/string.c
@@ -262,11 +262,13 @@ void ten_string_reserve(ten_string_t *self, size_t extra) {
     if (self->buf == self->pre_buf) {
       tmp = (char *)TEN_MALLOC(new_size);
       TEN_ASSERT(tmp, "Failed to allocate memory.");
+
       memcpy(tmp, self->buf, self->first_unused_idx);
     } else {
       tmp = (char *)TEN_REALLOC(self->buf, new_size);
       TEN_ASSERT(tmp, "Failed to allocate memory.");
     }
+
     self->buf = tmp;
     self->buf_size = new_size;
   }

diff --git a/core/src/ten_utils/sanitizer/memory_check.c b/core/src/ten_utils/sanitizer/memory_check.c
@@ -406,10 +406,15 @@ void *ten_sanitizer_memory_realloc(void *addr, size_t size,
         self, size, file_name, lineno, func_name);
     if (!record) {
       ten_free(self);
-      ten_sanitizer_memory_record_del(&g_memory_records, addr);
+      if (addr != NULL) {
+        ten_sanitizer_memory_record_del(&g_memory_records, addr);
+      }
       return NULL;
     }
 
+    if (addr != NULL) {
+      ten_sanitizer_memory_record_del(&g_memory_records, addr);
+    }
     ten_sanitizer_memory_record_add(&g_memory_records, record);
   }
 

diff --git a/core/src/ten_utils/value/value_set.c b/core/src/ten_utils/value/value_set.c
@@ -7,6 +7,7 @@
 #include "include_internal/ten_utils/value/value_set.h"
 
 #include "ten_utils/container/list.h"
+#include "ten_utils/lib/string.h"
 #include "ten_utils/macro/check.h"
 #include "ten_utils/value/type.h"
 #include "ten_utils/value/value.h"