Changeset 167968 in webkit

Timestamp:

Apr 29, 2014, 4:40:49 PM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16745596> [Cocoa] Crash when invoking a method with an unsigned parameter on a remote object
​https://bugs.webkit.org/show_bug.cgi?id=132366

Reviewed by Anders Carlsson.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(encodeInvocation): Handle the 'I' type code. Interpret the 'q' and 'Q' type codes in an
architecture-independent manner.
(decodeInvocationArguments): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-29  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16745596> [Cocoa] Crash when invoking a method with an unsigned parameter on a remote object
+        https://bugs.webkit.org/show_bug.cgi?id=132366
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (encodeInvocation): Handle the 'I' type code. Interpret the 'q' and 'Q' type codes in an
+        architecture-independent manner.
+        (decodeInvocationArguments): Ditto.
+
 2014-04-29  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm

@@ -147 +147 @@
         }
 
+        // unsigned
+        case 'I': {
+            unsigned value;
+            [invocation getArgument:&value atIndex:i];
+
+            encodeToObjectStream(encoder, @(value));
+            break;
+        }
+
         // char
         case 'c': {
@@ -165 +174 @@
         }
 
-        // NSInteger
+        // long
         case 'q': {
-            NSInteger value;
+            long value;
             [invocation getArgument:&value atIndex:i];
 
@@ -174 +183 @@
         }
 
-        // NSUInteger
+        // unsigned long
         case 'Q': {
-            NSUInteger value;
+            unsigned long value;
             [invocation getArgument:&value atIndex:i];
 
@@ -422 +431 @@
         }
 
+        // unsigned
+        case 'I': {
+            unsigned value = [decodeObjectFromObjectStream(decoder, [NSSet setWithObject:[NSNumber class]]) unsignedIntValue];
+            [invocation setArgument:&value atIndex:i];
+            break;
+        }
+
         // char
         case 'c': {
@@ -436 +452 @@
         }
 
-        // NSInteger
+        // long
         case 'q': {
-            NSInteger value = [decodeObjectFromObjectStream(decoder, [NSSet setWithObject:[NSNumber class]]) integerValue];
-            [invocation setArgument:&value atIndex:i];
-            break;
-        }
-
-        // NSUInteger
+            long value = [decodeObjectFromObjectStream(decoder, [NSSet setWithObject:[NSNumber class]]) longValue];
+            [invocation setArgument:&value atIndex:i];
+            break;
+        }
+
+        // unsigned long
         case 'Q': {
-            NSUInteger value = [decodeObjectFromObjectStream(decoder, [NSSet setWithObject:[NSNumber class]]) unsignedIntegerValue];
+            unsigned long value = [decodeObjectFromObjectStream(decoder, [NSSet setWithObject:[NSNumber class]]) unsignedLongValue];
             [invocation setArgument:&value atIndex:i];
             break;