Changeset 205036 in webkit

Timestamp:

Aug 26, 2016, 1:33:34 PM (9 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Infinite recursion calling -charValue on a WKNSNumber
​https://bugs.webkit.org/show_bug.cgi?id=161258

Reviewed by Anders Carlsson.

Source/WebKit2:

• Shared/Cocoa/WKNSNumber.mm:

(-[WKNSNumber charValue]): Override this…
(-[WKNSNumber boolValue]): …not this.

Tools:

• TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/Cocoa/WKNSNumber.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-08-26  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Infinite recursion calling -charValue on a WKNSNumber
+        https://bugs.webkit.org/show_bug.cgi?id=161258
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/Cocoa/WKNSNumber.mm:
+        (-[WKNSNumber charValue]): Override this…
+        (-[WKNSNumber boolValue]): …not this.
+
 2016-08-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/Shared/Cocoa/WKNSNumber.mm

@@ -107 +107 @@
 // MARK: NSNumber primitive methods
 
-- (BOOL)boolValue
+- (char)charValue
 {
     if (_type == API::Object::Type::Boolean)
         return _number._boolean->value();
 
-    return super.boolValue;
+    return super.charValue;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-08-26  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Infinite recursion calling -charValue on a WKNSNumber
+        https://bugs.webkit.org/show_bug.cgi?id=161258
+
+        Reviewed by Anders Carlsson.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm:
+        (TestWebKitAPI::TEST):
+
 2016-08-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm

@@ -46 +46 @@
 
     EXPECT_EQ(YES, booleanNumber.boolValue);
+    EXPECT_EQ(YES, booleanNumber.charValue);
     EXPECT_EQ(39UL, uint64Number.unsignedLongLongValue);
     EXPECT_EQ(39, uint64Number.intValue);