Title: [264829] trunk/Source/WebKit
Revision
264829
Author
[email protected]
Date
2020-07-24 09:03:45 -0700 (Fri, 24 Jul 2020)

Log Message

Add/Update CRASH_WITH_INFO() for invalid IPC message logging
<https://webkit.org/b/214713>

Reviewed by Anders Carlsson.

* Platform/IPC/cocoa/ConnectionCocoa.mm:
(IPC::Connection::sendMessage):
- Simplify logging by removing CString and using
  IPC::MessageName enum value instead of hash.
* Shared/Cocoa/AuxiliaryProcessCocoa.mm:
(WebKit::AuxiliaryProcess::didReceiveInvalidMessage):
- Add IPC::MessageName enum value to
  setCrashReportApplicationSpecificInformation() output.
- Change CRASH() to CRASH_WITH_INFO() and pass IPC::MessageName
  enum value.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (264828 => 264829)


--- trunk/Source/WebKit/ChangeLog	2020-07-24 15:53:05 UTC (rev 264828)
+++ trunk/Source/WebKit/ChangeLog	2020-07-24 16:03:45 UTC (rev 264829)
@@ -1,3 +1,21 @@
+2020-07-24  David Kilzer  <[email protected]>
+
+        Add/Update CRASH_WITH_INFO() for invalid IPC message logging
+        <https://webkit.org/b/214713>
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/IPC/cocoa/ConnectionCocoa.mm:
+        (IPC::Connection::sendMessage):
+        - Simplify logging by removing CString and using
+          IPC::MessageName enum value instead of hash.
+        * Shared/Cocoa/AuxiliaryProcessCocoa.mm:
+        (WebKit::AuxiliaryProcess::didReceiveInvalidMessage):
+        - Add IPC::MessageName enum value to
+          setCrashReportApplicationSpecificInformation() output.
+        - Change CRASH() to CRASH_WITH_INFO() and pass IPC::MessageName
+          enum value.
+
 2020-07-24  Youenn Fablet  <[email protected]>
 
         Use one socket server for the whole network process instead of one socket server per web process connection

Modified: trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm (264828 => 264829)


--- trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm	2020-07-24 15:53:05 UTC (rev 264828)
+++ trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm	2020-07-24 16:03:45 UTC (rev 264829)
@@ -273,9 +273,8 @@
         return false;
 
     default:
-        CString messageName(description(message->messageName()));
-        WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s', hash %d", kr, messageName.data(), messageName.hash()]);
-        CRASH_WITH_INFO(kr, messageName.hash());
+        WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s' (%hu)", kr, description(message->messageName()), message->messageName()]);
+        CRASH_WITH_INFO(kr, static_cast<std::underlying_type_t<IPC::MessageName>>(message->messageName()));
     }
 }
 

Modified: trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm (264828 => 264829)


--- trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm	2020-07-24 15:53:05 UTC (rev 264828)
+++ trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm	2020-07-24 16:03:45 UTC (rev 264829)
@@ -34,8 +34,8 @@
 
 void AuxiliaryProcess::didReceiveInvalidMessage(IPC::Connection&, IPC::MessageName messageName)
 {
-    setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Received invalid message: '%s'", description(messageName)]);
-    CRASH();
+    setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Received invalid message: '%s' (%hu)", description(messageName), messageName]);
+    CRASH_WITH_INFO(static_cast<std::underlying_type_t<IPC::MessageName>>(messageName));
 }
 
 bool AuxiliaryProcess::parentProcessHasEntitlement(const char* entitlement)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to