From 6e76d894fe9154f9d2aacd3388c91098d2436403 Mon Sep 17 00:00:00 2001
From: herman ten brugge <hermantenbrugge@home.nl>
Date: Wed, 7 Jul 2021 10:05:23 +0200
Subject: [PATCH] Fix macOS memcheck problems

---
 libtcc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libtcc.c b/libtcc.c
index 6d888c15..2002dd56 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -866,18 +866,21 @@ ST_FUNC int tcc_add_macos_sdkpath(TCCState* s)
 #else
     char *sdkroot = NULL, *pos = NULL;
     void* xcs = dlopen("libxcselect.dylib", RTLD_GLOBAL | RTLD_LAZY);
-    CString path = {};
+    CString path;
     int (*f)(unsigned int, char**) = dlsym(xcs, "xcselect_host_sdk_path");
 
     if (f) f(1, &sdkroot);
     if (!sdkroot) return -1;
     pos = strstr(sdkroot,"SDKs/MacOSX");
     if (!pos) return -1;
+    cstr_new(&path);
     cstr_cat(&path, sdkroot, pos-sdkroot);
     cstr_cat(&path, SZPAIR("SDKs/MacOSX.sdk/usr/lib\0") );
     tcc_add_library_path(s, (char*)path.data);
     cstr_free(&path);
+#ifndef MEM_DEBUG /* FIXME: How to use free() instead of tcc_free() */
     tcc_free(sdkroot);
+#endif
     return 0;
 #endif
 }
@@ -1076,6 +1079,10 @@ ST_FUNC int tcc_add_file_internal(TCCState *s1, const char *filename, int flags)
                     tcc_add_dllref(s1, soname)->handle = dl;
                     ret = 0;
                 }
+# ifdef TCC_TARGET_MACHO
+	        if (strcmp(filename, soname))
+		    tcc_free((void *)soname);
+#endif
 #endif
                 break;
             }