Title: [264852] branches/safari-610.1.23.1-branch/Source/WebKit
- Revision
- 264852
- Author
- [email protected]
- Date
- 2020-07-24 12:59:56 -0700 (Fri, 24 Jul 2020)
Log Message
Cherry-pick r264829. rdar://problem/66022006
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog (264851 => 264852)
--- branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog 2020-07-24 19:56:37 UTC (rev 264851)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog 2020-07-24 19:59:56 UTC (rev 264852)
@@ -1,3 +1,44 @@
+2020-07-24 Russell Epstein <[email protected]>
+
+ Cherry-pick r264829. rdar://problem/66022006
+
+ 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-23 Alan Coon <[email protected]>
Cherry-pick r264747. rdar://problem/65995978
Modified: branches/safari-610.1.23.1-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm (264851 => 264852)
--- branches/safari-610.1.23.1-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm 2020-07-24 19:56:37 UTC (rev 264851)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm 2020-07-24 19:59:56 UTC (rev 264852)
@@ -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: branches/safari-610.1.23.1-branch/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm (264851 => 264852)
--- branches/safari-610.1.23.1-branch/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm 2020-07-24 19:56:37 UTC (rev 264851)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm 2020-07-24 19:59:56 UTC (rev 264852)
@@ -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
