Loading...
--- libmalloc/libmalloc-521.100.59/src/platform.h
+++ libmalloc/libmalloc-657.80.3/src/platform.h
@@ -186,14 +186,6 @@
#define CONFIG_FEATUREFLAGS_SIMPLE 0
#endif
-
-// Sanitizer zone, only useful on macOS (+ DriverKit, 64-bit simulators) and exclavecore/exclavekit.
-#if (MALLOC_TARGET_EXCLAVES || TARGET_OS_OSX || TARGET_OS_DRIVERKIT || TARGET_OS_SIMULATOR) && MALLOC_TARGET_64BIT
-#define CONFIG_SANITIZER 1
-#else
-#define CONFIG_SANITIZER 0
-#endif
-
// presence of commpage memsize
#define CONFIG_HAS_COMMPAGE_MEMSIZE 1
@@ -201,9 +193,11 @@
#define CONFIG_HAS_COMMPAGE_NCPUS 1
// Distribute magazines by cluster number if nmagazines == nclusters
-#if (TARGET_OS_IOS && !TARGET_OS_SIMULATOR) || MALLOC_TARGET_DK_IOS
+#if (TARGET_OS_IOS && !TARGET_OS_SIMULATOR) || \
+ MALLOC_TARGET_DK_IOS || \
+ TARGET_OS_OSX || MALLOC_TARGET_DK_OSX
#define CONFIG_MAGAZINE_PER_CLUSTER 1
-#else // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
+#else
#define CONFIG_MAGAZINE_PER_CLUSTER 0
#endif
@@ -212,18 +206,15 @@
#define CONFIG_NANO_USES_HYPER_SHIFT 0
#define CONFIG_SZONE_USES_HYPER_SHIFT 0
-// FIXME: limit number of malloc_create_zone() wrapper zones for watchOS to remove this
-#if TARGET_OS_OSX || TARGET_OS_IOS
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 1
-#else
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 0
-#endif
-
-#if MALLOC_TARGET_EXCLAVES
-#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_NONE
-#else
+#if TARGET_OS_OSX
+#define CONFIG_CHECK_PLATFORM_BINARY 1
+#else
+#define CONFIG_CHECK_PLATFORM_BINARY 0
+#endif
+
+#define CONFIG_CHECK_SECURITY_POLICY 1
+
#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
-#endif // MALLOC_TARGET_EXCLAVES
#ifndef MALLOC_XZONE_ENABLED_DEFAULT
@@ -243,12 +234,16 @@
#endif
-#if MALLOC_TARGET_IOS_ONLY
+#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_OSX
#define CONFIG_MALLOC_PROCESS_IDENTITY 1
#else
#define CONFIG_MALLOC_PROCESS_IDENTITY 0
#endif
+#ifndef CONFIG_SANITIZER
+#define CONFIG_SANITIZER 1
+#endif
+
#define MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT true