Changeset 245269 in webkit

Timestamp:

May 13, 2019, 7:25:56 PM (7 years ago)

Author:

youenn@apple.com

Message:

[Mac] Use realpath for dlopen_preflight
​https://bugs.webkit.org/show_bug.cgi?id=197803

Reviewed by Eric Carlson.

• wtf/cocoa/SoftLinking.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)
• wtf/cocoa/SoftLinking.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-05-13  Youenn Fablet  <youenn@apple.com>
+
+        [Mac] Use realpath for dlopen_preflight
+        https://bugs.webkit.org/show_bug.cgi?id=197803
+
+        Reviewed by Eric Carlson.
+
+        * wtf/cocoa/SoftLinking.h:
+
 2019-05-13  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1548 +1548 @@
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500
+#define USE_REALPATH_FOR_DLOPEN_PREFLIGHT 1
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
 #define HAVE_AVPLAYER_RESOURCE_CONSERVATION_LEVEL 1

trunk/Source/WTF/wtf/cocoa/SoftLinking.h

@@ -25 +25 @@
 #pragma once
 
-#import <wtf/Assertions.h>
 #import <dlfcn.h>
 #import <objc/runtime.h>
+#import <wtf/Assertions.h>
+#import <wtf/FileSystem.h>
 
 #pragma mark - Soft-link macros for use within a single source file
@@ -64 +65 @@
     }
 
+#if USE(REALPATH_FOR_DLOPEN_PREFLIGHT)
+#define DLOPEN_PREFLIGHT(path) dlopen_preflight(FileSystem::realPath(path##_s).utf8().data())
+#else
+#define DLOPEN_PREFLIGHT(path) dlopen_preflight(path)
+#endif
+
 #define SOFT_LINK_FRAMEWORK_OPTIONAL_PREFLIGHT(framework) \
     static bool framework##LibraryIsAvailable() \
     { \
-        static bool frameworkLibraryIsAvailable = dlopen_preflight("/System/Library/Frameworks/" #framework ".framework/" #framework); \
+        static bool frameworkLibraryIsAvailable = DLOPEN_PREFLIGHT("/System/Library/Frameworks/" #framework ".framework/" #framework); \
         return frameworkLibraryIsAvailable; \
     }