Forgot a bunch of other box_ malloc/realloc/calloc/free use

11 files changed, 56 insertions, 55 deletions

diff --git a/src/emu/x64tls.c b/src/emu/x64tls.c
index 59e739f2..d2e138d9 100755
--- a/src/emu/x64tls.c
+++ b/src/emu/x64tls.c
@@ -197,10 +197,10 @@ static tlsdatasize_t* setupTLSData(box64context_t* context)
     // Setup the GS segment:
     int dtssize = sizeDTS(context);
     int datasize = sizeTLSData(context->tlssize);
-    void *ptr_oversized = (char*)malloc(dtssize+POS_TLS+datasize);
+    void *ptr_oversized = (char*)box_malloc(dtssize+POS_TLS+datasize);
     void *ptr = (void*)((uintptr_t)ptr_oversized + datasize);
     memcpy((void*)((uintptr_t)ptr-context->tlssize), context->tlsdata, context->tlssize);
-    tlsdatasize_t *data = (tlsdatasize_t*)calloc(1, sizeof(tlsdatasize_t));
+    tlsdatasize_t *data = (tlsdatasize_t*)box_calloc(1, sizeof(tlsdatasize_t));
     data->data = ptr;
     data->tlssize = context->tlssize;
     data->ptr = ptr_oversized;
diff --git a/src/include/khash.h b/src/include/khash.h
index dfce7aff..9d20a0e6 100755
--- a/src/include/khash.h
+++ b/src/include/khash.h
@@ -167,16 +167,16 @@ typedef khint_t khiter_t;
 #endif
 
 #ifndef kcalloc
-#define kcalloc(N,Z) calloc(N,Z)
+#define kcalloc(N,Z) box_calloc(N,Z)
 #endif
 #ifndef kmalloc
-#define kmalloc(Z) malloc(Z)
+#define kmalloc(Z) box_malloc(Z)
 #endif
 #ifndef krealloc
-#define krealloc(P,Z) realloc(P,Z)
+#define krealloc(P,Z) box_realloc(P,Z)
 #endif
 #ifndef kfree
-#define kfree(P) free(P)
+#define kfree(P) box_free(P)
 #endif
 
 static const double __ac_HASH_UPPER = 0.77;
diff --git a/src/include/wrappedlibs.h b/src/include/wrappedlibs.h
index 871f7af0..7bb4d5a2 100755
--- a/src/include/wrappedlibs.h
+++ b/src/include/wrappedlibs.h
@@ -10,8 +10,8 @@ typedef void (*wrappedlib_fini_t)(library_t * lib);
 typedef int (*wrappedlib_get_t)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz, int* weak, int version, const char* vername, int local);
 
 void setNeededLibs(library_t* lib, int n, ...);
-#define SETALT(A)       lib->w.altmy = strdup(#A)
-#define SETALTPREFIX(A) lib->w.altprefix = strdup(A)
+#define SETALT(A)       lib->w.altmy = box_strdup(#A)
+#define SETALTPREFIX(A) lib->w.altprefix = box_strdup(A)
 
 typedef struct wrappedlib_s {
     const char*         name;
diff --git a/src/librarian/librarian.c b/src/librarian/librarian.c
index 170ff329..08ca9c1e 100755
--- a/src/librarian/librarian.c
+++ b/src/librarian/librarian.c
@@ -19,7 +19,7 @@ KHASH_MAP_IMPL_INT(mapoffsets, cstr_t);
 
 lib_t *NewLibrarian(box64context_t* context, int ownlibs)
 {
-    lib_t *maplib = (lib_t*)calloc(1, sizeof(lib_t));
+    lib_t *maplib = (lib_t*)box_calloc(1, sizeof(lib_t));
     
     maplib->mapoffsets = kh_init(mapoffsets);
     maplib->globaldata = NewMapSymbols();
@@ -73,7 +73,7 @@ void FreeLibrarian(lib_t **maplib, x64emu_t *emu)
     
     if((*maplib)->ownlibs && (*maplib)->libsz) {
         printf_log(LOG_DEBUG, "Closing %d libs from maplib %p\n", (*maplib)->libsz, *maplib);
-        char *freed = (char*)calloc((*maplib)->libsz, sizeof(char));
+        char *freed = (char*)box_calloc((*maplib)->libsz, sizeof(char));
         if (!freed) {
             printf_log(LOG_INFO, "Failed to malloc freed table, using old algorithm (a crash is likely)\n");
             for (int i=(*maplib)->libsz-1; i>=0; --i) 
@@ -87,10 +87,10 @@ void FreeLibrarian(lib_t **maplib, x64emu_t *emu)
             }
             memset((*maplib)->libraries, 0, (*maplib)->libsz*sizeof(library_t*)); // NULL = 0 anyway
             (*maplib)->libsz = 0;
-            free(freed);
+            box_free(freed);
         }
     }
-    free((*maplib)->libraries);
+    box_free((*maplib)->libraries);
     (*maplib)->libraries = NULL;
 
     if((*maplib)->mapoffsets) {
@@ -102,7 +102,7 @@ void FreeLibrarian(lib_t **maplib, x64emu_t *emu)
     if((*maplib)->bridge)
         FreeBridge(&(*maplib)->bridge);
 
-    free(*maplib);
+    box_free(*maplib);
     *maplib = NULL;
 
 }
@@ -144,7 +144,7 @@ void MapLibAddLib(lib_t* maplib, library_t* lib)
         return;
     if (maplib->libsz == maplib->libcap) {
         maplib->libcap += 8;
-        maplib->libraries = (library_t**)realloc(maplib->libraries, maplib->libcap*sizeof(library_t*));
+        maplib->libraries = (library_t**)box_realloc(maplib->libraries, maplib->libcap*sizeof(library_t*));
     }
     maplib->libraries[maplib->libsz] = lib;
     ++maplib->libsz;
@@ -334,7 +334,7 @@ int AddNeededLib(lib_t* maplib, needed_libs_t* neededlibs, library_t* deplib, in
 {
     box64_mapclean = 0;
     if(!neededlibs) {
-        neededlibs = calloc(1, sizeof(needed_libs_t));
+        neededlibs = box_calloc(1, sizeof(needed_libs_t));
     }
     int idx = neededlibs->size;
     // Add libs and symbol
@@ -483,7 +483,7 @@ int GetGlobalSymbolStartEnd(lib_t *maplib, const char* name, uintptr_t* start, u
                 if(end2>*end && start2==end2)
                     *end = end2;
             }
-            free(buff);
+            box_free(buff);
         }
         return 1;
     }
diff --git a/src/librarian/library.c b/src/librarian/library.c
index 77a8d3a9..9598a994 100755
--- a/src/librarian/library.c
+++ b/src/librarian/library.c
@@ -531,21 +531,21 @@ void Free1Library(library_t **lib, x64emu_t* emu)
     if((*lib)->gbridgemap) {
         bridged_t *br;
         kh_foreach_value_ref((*lib)->gbridgemap, br,
-            free(br->name);
+            box_free(br->name);
         );
         kh_destroy(bridgemap, (*lib)->gbridgemap);
     }
     if((*lib)->wbridgemap) {
         bridged_t *br;
         kh_foreach_value_ref((*lib)->wbridgemap, br,
-            free(br->name);
+            box_free(br->name);
         );
         kh_destroy(bridgemap, (*lib)->wbridgemap);
     }
     if((*lib)->lbridgemap) {
         bridged_t *br;
         kh_foreach_value_ref((*lib)->lbridgemap, br,
-            free(br->name);
+            box_free(br->name);
         );
         kh_destroy(bridgemap, (*lib)->lbridgemap);
     }
@@ -1012,7 +1012,7 @@ void add_neededlib(needed_libs_t* needed, library_t* lib)
         return;
     if(needed->size == needed->cap) {
         needed->cap += 8;
-        needed->libs = (library_t**)realloc(needed->libs, needed->cap*sizeof(library_t*));
+        needed->libs = (library_t**)box_realloc(needed->libs, needed->cap*sizeof(library_t*));
     }
     needed->libs[needed->size++] = lib;
 }
@@ -1023,7 +1023,7 @@ void free_neededlib(needed_libs_t* needed)
     needed->cap = 0;
     needed->size = 0;
     if(needed->libs)
-        free(needed->libs);
+        box_free(needed->libs);
     needed->libs = NULL;
 }
 void add_dependedbylib(needed_libs_t* dependedby, library_t* lib)
@@ -1034,7 +1034,7 @@ void add_dependedbylib(needed_libs_t* dependedby, library_t* lib)
         return;
     if(dependedby->size == dependedby->cap) {
         dependedby->cap += 8;
-        dependedby->libs = (library_t**)realloc(dependedby->libs, dependedby->cap*sizeof(library_t*));
+        dependedby->libs = (library_t**)box_realloc(dependedby->libs, dependedby->cap*sizeof(library_t*));
     }
     dependedby->libs[dependedby->size++] = lib;
 }
@@ -1045,7 +1045,7 @@ void free_dependedbylib(needed_libs_t* dependedby)
     dependedby->cap = 0;
     dependedby->size = 0;
     if(dependedby->libs)
-        free(dependedby->libs);
+        box_free(dependedby->libs);
     dependedby->libs = NULL;
 }
 
diff --git a/src/librarian/symbols.c b/src/librarian/symbols.c
index 3f5bc657..2fbbf118 100644
--- a/src/librarian/symbols.c
+++ b/src/librarian/symbols.c
@@ -41,7 +41,7 @@ void FreeMapSymbols(kh_mapsymbols_t** map)
     if(!map || !(*map))
         return;
     versymbols_t *v;
-    kh_foreach_value_ref(*map, v, free(v->syms););
+    kh_foreach_value_ref(*map, v, box_free(v->syms););
 
     kh_destroy(mapsymbols, *map);
     *map = NULL;
@@ -160,7 +160,7 @@ void AddSymbol(kh_mapsymbols_t *mapsymbols, const char* name, uintptr_t addr, ui
     // add a new record
     if(v->sz == v->cap) {
         v->cap+=4;
-        v->syms = (versymbol_t*)realloc(v->syms, v->cap*sizeof(versymbol_t));
+        v->syms = (versymbol_t*)box_realloc(v->syms, v->cap*sizeof(versymbol_t));
     }
     int idx = v->sz++;
     v->syms[idx].version = ver;
@@ -197,7 +197,7 @@ void AddUniqueSymbol(kh_mapsymbols_t *mapsymbols, const char* name, uintptr_t ad
     // add a new record
     if(v->sz == v->cap) {
         v->cap+=4;
-        v->syms = (versymbol_t*)realloc(v->syms, v->cap*sizeof(versymbol_t));
+        v->syms = (versymbol_t*)box_realloc(v->syms, v->cap*sizeof(versymbol_t));
     }
     int idx = v->sz++;
     v->syms[idx].version = ver;
@@ -253,7 +253,7 @@ void FreeDefaultVersion(kh_defaultversion_t** def)
     if(!def || !*def)
         return;
     const char* v;
-    kh_foreach_value(*def, v, free((char*)v););
+    kh_foreach_value(*def, v, box_free((char*)v););
 
     kh_destroy(defaultversion, *def);
     *def = NULL;
@@ -264,7 +264,7 @@ void AddDefaultVersion(kh_defaultversion_t* def, const char* symname, const char
     int ret;
     khint_t k = kh_put(defaultversion, def, symname, &ret);
     if(!ret) return;    // already set!
-    kh_value(def, k) = strdup(vername);
+    kh_value(def, k) = box_strdup(vername);
 }
 const char* GetDefaultVersion(kh_defaultversion_t* def, const char* symname)
 {
diff --git a/src/libtools/threads.c b/src/libtools/threads.c
index 1a295345..6ca79091 100755
--- a/src/libtools/threads.c
+++ b/src/libtools/threads.c
@@ -299,7 +299,7 @@ void freeAlignedAttr(void* attr)
 		return;
 	aligned_attr_t* at = (aligned_attr_t*)attr;
 	if(at->sign==SIGN_ATTR) {
-		free(at->at);
+		box_free(at->at);
 		at->sign = 0LL;
 	}
 }
diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c
index 0c5663bc..b481963d 100755
--- a/src/wrapped/wrappedglib2.c
+++ b/src/wrapped/wrappedglib2.c
@@ -1067,12 +1067,12 @@ EXPORT void* my_g_build_path(x64emu_t *emu, void* sep, void* first, uintptr_t* d
         p = (void*)getVArgs(emu, 2, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc((n+1) *sizeof(void*));
+    void** args = (void**)box_malloc((n+1) *sizeof(void*));
     args[0] = first;
     for(int i=0; i<n; ++i)
         args[i+1] = (void*)getVArgs(emu, 2, data, i);
     p = my->g_build_pathv(sep, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
@@ -1236,11 +1236,11 @@ EXPORT void* my_g_strjoin(x64emu_t* emu, void* sep, uintptr_t* data)
         p = (void*)getVArgs(emu, 1, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc(n *sizeof(void*));
+    void** args = (void**)box_malloc(n *sizeof(void*));
     for(int i=0; i<n; ++i)
         args[i] = (void*)getVArgs(emu, 1, data, i);
     p = my->g_strjoinv(sep, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
@@ -1291,12 +1291,12 @@ EXPORT void* my_g_strconcat(x64emu_t* emu, void* first, uintptr_t* data)
         p = (void*)getVArgs(emu, 1, data, n++);
     }
     ++n;    // final NULL
-    void** args = (void**)malloc((n+1) *sizeof(void*));
+    void** args = (void**)box_malloc((n+1) *sizeof(void*));
     args[0] = first;
     for(int i=0; i<n; ++i)
         args[i+1] = (void*)getVArgs(emu, 1, data, i);
     p = my->g_strjoinv(NULL, args);
-    free(args);
+    box_free(args);
     return p;
 }
 
diff --git a/src/wrapped/wrappedlib_init.h b/src/wrapped/wrappedlib_init.h
index 2b34acab..f6b52668 100755
--- a/src/wrapped/wrappedlib_init.h
+++ b/src/wrapped/wrappedlib_init.h
@@ -2,6 +2,7 @@
 #error Meh
 #endif
 
+#include "debug.h"
 #include "librarian/library_inner.h"
 
 #define FUNC3(M,N) wrapped##M##N
@@ -136,10 +137,10 @@ int FUNC(_init)(library_t* lib, box64context_t* box64)
 #endif
                 return -1;
 #ifdef ALTNAME2
-                else lib->path = strdup(ALTNAME2);
-            } else lib->path = strdup(ALTNAME);
+                else lib->path = box_strdup(ALTNAME2);
+            } else lib->path = box_strdup(ALTNAME);
 #endif
-        } else lib->path = strdup(MAPNAME(Name));
+        } else lib->path = box_strdup(MAPNAME(Name));
     }
     WrappedLib_CommonInit(lib);
 
diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c
index fa12a53c..2545cbd2 100755
--- a/src/wrapped/wrappedlibx11.c
+++ b/src/wrapped/wrappedlibx11.c
@@ -622,8 +622,8 @@ if (new_va[i] && strcmp((char*)new_va[i], A) == 0) {    \
 EXPORT void* my_XVaCreateNestedList(x64emu_t* emu, int unused, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2 ;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -633,16 +633,16 @@ EXPORT void* my_XVaCreateNestedList(x64emu_t* emu, int unused, uintptr_t* va) {
 
     void* res = NULL;
     VA_CALL(my->XVaCreateNestedList, unused, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 
 EXPORT void* my_XCreateIC(x64emu_t* emu, void* xim, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -652,16 +652,16 @@ EXPORT void* my_XCreateIC(x64emu_t* emu, void* xim, uintptr_t* va) {
 
     void* res = NULL;
     VA_CALL(my->XCreateIC, xim, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 
 EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XICCallback* callbacks = (XICCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XICCallback* callbacks = (XICCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     for (int i = 0; i < n; i += 2) {
         new_va[i] = (void*)getVArgs(emu, 1, va, i);
@@ -671,8 +671,8 @@ EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
 
     void* res = NULL; 
     VA_CALL(my->XSetICValues, xic, new_va, n, res);
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 #undef GO
@@ -680,8 +680,8 @@ EXPORT void* my_XSetICValues(x64emu_t* emu, void* xic, uintptr_t* va) {
 EXPORT void* my_XSetIMValues(x64emu_t* emu, void* xim, uintptr_t* va) {
     int n = 0;
     while (getVArgs(emu, 1, va, n)) n+=2;
-    void** new_va = malloc(sizeof(void*) * n);
-    XIMCallback* callbacks = (XIMCallback*)malloc(sizeof(XIMCallback) * n);
+    void** new_va = box_malloc(sizeof(void*) * n);
+    XIMCallback* callbacks = (XIMCallback*)box_malloc(sizeof(XIMCallback) * n);
 
     #define GO(A)                                           \
     if (new_va[i] && strcmp((char*)new_va[i], A) == 0) {    \
@@ -701,8 +701,8 @@ EXPORT void* my_XSetIMValues(x64emu_t* emu, void* xim, uintptr_t* va) {
     
     void* res = NULL;
     VA_CALL(my->XSetIMValues, xim, new_va, n, res)
-    free(new_va);
-    free(callbacks);
+    box_free(new_va);
+    box_free(callbacks);
     return res;
 }
 #undef VA_CALL
diff --git a/src/wrapped/wrappedvulkan.c b/src/wrapped/wrappedvulkan.c
index 21d9ea8c..20310452 100755
--- a/src/wrapped/wrappedvulkan.c
+++ b/src/wrapped/wrappedvulkan.c
@@ -325,7 +325,7 @@ static void* find_DebugReportCallbackEXT_Fct(void* fct)
 
 #undef SUPER
 
-//#define PRE_INIT if(libGL) {lib->w.lib = dlopen(libGL, RTLD_LAZY | RTLD_GLOBAL); lib->path = strdup(libGL);} else
+//#define PRE_INIT if(libGL) {lib->w.lib = dlopen(libGL, RTLD_LAZY | RTLD_GLOBAL); lib->path = box_strdup(libGL);} else
 
 #define PRE_INIT        \
     if(box64_novulkan)  \