Changeset 280957 in webkit

Timestamp:

Aug 11, 2021, 9:35:22 PM (5 years ago)

Author:

Peng Liu

Message:

Function _os_feature_enabled_impl() expects compile-time static strings as arguments
​https://bugs.webkit.org/show_bug.cgi?id=229017
<rdar://81813732>

Reviewed by Tim Horton.

There are multiple issues in the current implementation of isFeatureFlagEnabled().

1. _os_feature_enabled_impl() expects compile-time static strings as arguments.

So we should not use String here.

2. As Simon Fraser pointed out, String::characters8() is not null terminated.

Source/WebKit:

• Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:

(WebKit::isFeatureFlagEnabled):

• Shared/WebPreferencesDefaultValues.cpp:

(WebKit::isFeatureFlagEnabled):

• Shared/WebPreferencesDefaultValues.h:

Source/WebKitLegacy/mac:

• WebView/WebPreferencesDefaultValues.h:
• WebView/WebPreferencesDefaultValues.mm:

(WebKit::isFeatureFlagEnabled):

Location:

trunk/Source

Files:

• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm (modified) (2 diffs)
• WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
• WebKit/Shared/WebPreferencesDefaultValues.h (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        Function _os_feature_enabled_impl() expects compile-time static strings as arguments
+        https://bugs.webkit.org/show_bug.cgi?id=229017
+        <rdar://81813732>
+
+        Reviewed by Tim Horton.
+
+        There are multiple issues in the current implementation of `isFeatureFlagEnabled()`.
+        1. `_os_feature_enabled_impl()` expects compile-time static strings as arguments.
+        So we should not use `String` here.
+        2. As Simon Fraser pointed out, `String::characters8()` is not null terminated.
+
+        * Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm:
+        (WebKit::isFeatureFlagEnabled):
+        * Shared/WebPreferencesDefaultValues.cpp:
+        (WebKit::isFeatureFlagEnabled):
+        * Shared/WebPreferencesDefaultValues.h:
+
 2021-08-11  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/WebPreferencesDefaultValuesCocoa.mm

@@ -39 +39 @@
 
 // Because of <rdar://problem/60608008>, WebKit has to parse the feature flags plist file
-bool isFeatureFlagEnabled(const String& featureName, bool defaultValue)
+bool isFeatureFlagEnabled(const char* featureName, bool defaultValue)
 {
 #if HAVE(SYSTEM_FEATURE_FLAGS)
@@ -50 +50 @@
 
     if (isSystemWebKit)
-        return _os_feature_enabled_impl("WebKit", (const char*)featureName.characters8());
+        return _os_feature_enabled_impl("WebKit", featureName);
 
     return defaultValue;
 #else
     UNUSED_PARAM(defaultValue);
-    return _os_feature_enabled_impl("WebKit", (const char*)featureName.characters8());
+    return _os_feature_enabled_impl("WebKit", featureName);
 #endif // PLATFORM(MAC)
 

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -43 +43 @@
 
 #if !PLATFORM(COCOA)
-bool isFeatureFlagEnabled(const String&, bool defaultValue)
+bool isFeatureFlagEnabled(const char*, bool defaultValue)
 {
     return defaultValue;

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h

@@ -36 +36 @@
 namespace WebKit {
 
-bool isFeatureFlagEnabled(const String&, bool defaultValue = false);
+bool isFeatureFlagEnabled(const char*, bool defaultValue = false);
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        Function _os_feature_enabled_impl() expects compile-time static strings as arguments
+        https://bugs.webkit.org/show_bug.cgi?id=229017
+        <rdar://81813732>
+
+        Reviewed by Tim Horton.
+
+        There are multiple issues in the current implementation of `isFeatureFlagEnabled()`.
+        1. `_os_feature_enabled_impl()` expects compile-time static strings as arguments.
+        So we should not use `String` here.
+        2. As Simon Fraser pointed out, `String::characters8()` is not null terminated.
+
+        * WebView/WebPreferencesDefaultValues.h:
+        * WebView/WebPreferencesDefaultValues.mm:
+        (WebKit::isFeatureFlagEnabled):
+
 2021-08-10  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h

@@ -37 +37 @@
 
 #if PLATFORM(COCOA)
-bool isFeatureFlagEnabled(const String&, bool defaultValue = false);
+bool isFeatureFlagEnabled(const char*, bool defaultValue = false);
 #endif
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm

@@ -46 +46 @@
 
 // Because of <rdar://problem/60608008>, WebKit has to parse the feature flags plist file
-bool isFeatureFlagEnabled(const String& featureName, bool defaultValue)
+bool isFeatureFlagEnabled(const char* featureName, bool defaultValue)
 {
 #if HAVE(SYSTEM_FEATURE_FLAGS)
@@ -54 +54 @@
 #if PLATFORM(COCOA)
     UNUSED_PARAM(defaultValue);
-    return _os_feature_enabled_impl("WebKit", (const char*)featureName.characters8());
+    return _os_feature_enabled_impl("WebKit", featureName);
 #endif // PLATFORM(MAC)