From 8e46e46a40bfd92779a1f4d3fea8444ab3402537 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 7 Aug 2021 21:14:38 +0200 Subject: [PATCH] Simplify CFSearchpathForDirectoriesInDomains - one less leak - not out of the woods yet though --- frontend/drivers/platform_darwin.m | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index fd35792f64..ac316d97d7 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -128,28 +128,12 @@ static void CFSearchPathForDirectoriesInDomains( #else NSSearchPathDirectory dir = NSDocumentDirectory; #endif - CFTypeRef array_val = (CFTypeRef)CFBridgingRetainCompat( + CFTypeRef array_val = (CFTypeRef)CFBridgingRetainCompat([ NSSearchPathForDirectoriesInDomains(dir, - NSUserDomainMask, YES)); + NSUserDomainMask, YES) firstObject]); if (array_val) - { - CFArrayRef array = CFRetain(array_val); - CFTypeRef path_val = (CFTypeRef)CFArrayGetValueAtIndex(array, 0); - - if (path_val) - { - CFStringRef path = CFRetain(path_val); - if (path) - { - CFStringGetCString(path, s, len, kCFStringEncodingUTF8); - CFRelease(path); - } - } - - if (array) - CFRelease(array); - } + CFStringGetCString(array_val, s, len, kCFStringEncodingUTF8); } static void CFTemporaryDirectory(char *s, size_t len)