215154 2020-08-04 18:36:18 -0700 [Cocoa] Remove obsolete sandbox extension after r264178 2020-08-05 11:50:37 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham webkit-bug-importer oldest_to_newest 1677851 0 pvollan 2020-08-04 18:36:18 -0700 After r264178, the code related to issuing an extension to com.apple.lsd.mapdb is obsolete, and should be removed. 1677852 1 pvollan 2020-08-04 18:36:35 -0700 rdar://problem/66549976 1677854 2 405976 pvollan 2020-08-04 18:38:39 -0700 Created attachment 405976 Patch 1677983 3 405976 bfulgham 2020-08-05 10:59:48 -0700 Comment on attachment 405976 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405976&action=review r=me > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:-427 > - parameters.mapDBExtensionHandle = WTFMove(mapDBHandle); Can we get rid of parameters.mapDBExtensionHandle, too? Or is it still used in some cases? 1677986 4 pvollan 2020-08-05 11:06:39 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 405976 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=405976&action=review > > r=me > > > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:-427 > > - parameters.mapDBExtensionHandle = WTFMove(mapDBHandle); > > Can we get rid of parameters.mapDBExtensionHandle, too? Or is it still used > in some cases? That is a good point! Will fix. Thanks for reviewing! 1677988 5 406014 pvollan 2020-08-05 11:15:06 -0700 Created attachment 406014 Patch 1678007 6 ews-feeder 2020-08-05 11:50:37 -0700 Committed r265295: <https://trac.webkit.org/changeset/265295> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406014. 405976 2020-08-04 18:38:39 -0700 2020-08-05 10:59:48 -0700 Patch bug-215154-20200804183839.patch text/plain 4827 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjUyNzIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTA0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFJlbW92ZSBvYnNv bGV0ZSBzYW5kYm94IGV4dGVuc2lvbiBhZnRlciByMjY0MTc4CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxNTQKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzY2NTQ5OTc2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFmdGVyIHIyNjQxNzgsIHRoZSBjb2RlIHJlbGF0ZWQgdG8gaXNzdWluZyBhbiBleHRl bnNpb24gdG8gY29tLmFwcGxlLmxzZC5tYXBkYiBpcyBvYnNvbGV0ZSwgYW5kIHNob3VsZCBiZSBy ZW1vdmVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0 cy4KKworICAgICAgICAqIFJlc291cmNlcy9TYW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5X ZWJLaXQuV2ViQ29udGVudC5zYjoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vz c1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3Jt SW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViUHJv Y2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9j ZXNzLnNiLmluOgorCiAyMDIwLTA4LTA0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIyNjUyNjMKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldl YktpdC5XZWJDb250ZW50LnNiCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvUmVzb3VyY2Vz L1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNiCShyZXZp c2lvbiAyNjUyNjYpCisrKyBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYW5kYm94UHJvZmlsZXMv aW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYgkod29ya2luZyBjb3B5KQpAQCAtOTYw LDcgKzk2MCw2IEBACiAgICAgICAgICAgICAiY29tLmFwcGxlLmNvbnRhaW5lcm1hbmFnZXJkIgog ICAgICAgICAgICAgImNvbS5hcHBsZS5kaWFnbm9zdGljZCIKICAgICAgICAgICAgICJjb20uYXBw bGUuaXBob25lLmF4c2VydmVyLXN5c3RlbXdpZGUiCi0gICAgICAgICAgICAiY29tLmFwcGxlLmxz ZC5tYXBkYiIKICAgICAgICAgICAgICJjb20uYXBwbGUubW9iaWxlYXNzZXRkLnYyIgogICAgICAg ICAgICAgImNvbS5hcHBsZS5tb2JpbGVnZXN0YWx0LnhwYyIKICAgICAgICAgICAgICJjb20uYXBw bGUubmVoZWxwZXIiCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHJldmlzaW9uIDI2NTI2NikKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29w eSkKQEAgLTQyMSwxMCArNDIxLDYgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0 aWFsaXplVwogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIHBhcmFtZXRlcnMuc3lzdGVtSGFzQmF0 dGVyeSA9IHN5c3RlbUhhc0JhdHRlcnkoKTsKICAgICBwYXJhbWV0ZXJzLnN5c3RlbUhhc0FDID0g Y2FjaGVkU3lzdGVtSGFzQUMoKS52YWx1ZU9yKHRydWUpOwotCi0gICAgU2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlIG1hcERCSGFuZGxlOwotICAgIGlmIChTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVI YW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUubHNkLm1hcGRiIl9zLCBXVEY6Om51bGxvcHQs IG1hcERCSGFuZGxlLCBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Tm9SZXBvcnQpKQotICAgICAg ICBwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShtYXBEQkhhbmRsZSk7 CiAjZW5kaWYKIAogICAgIGlmIChyZXF1aXJlc0NvbnRhaW5lck1hbmFnZXJBY2Nlc3MoKSkgewpJ bmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmlu Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJv Y2Vzcy5zYi5pbgkocmV2aXNpb24gMjY1MjY2KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L2NvbS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluCSh3b3JraW5nIGNvcHkpCkBAIC05NzMsNyArOTcz LDYgQEAKICAgICAgICAgICAgICJjb20uYXBwbGUuY2ZwcmVmc2QuZGFlbW9uIgogICAgICAgICAg ICAgImNvbS5hcHBsZS5jb250YWluZXJtYW5hZ2VyZCIKICAgICAgICAgICAgICJjb20uYXBwbGUu dGNjZCIKLSAgICAgICAgICAgICJjb20uYXBwbGUubHNkLm1hcGRiIgogICAgICAgICAgICAgImNv bS5hcHBsZS5CbHVldG9vdGhTZXJ2aWNlcyIKIAogICAgICAgICAgICAgOzs7IEZJWE1FKDIwNzcx Nik6IFRoZSBmb2xsb3dpbmcgc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiB0aGUgR1BVIHByb2Nlc3Mg aXMgY29tcGxldGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNpb24gMjY1MjY3KQorKysgU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjM3 LDI0ICsyMzcsNiBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAg ICAgICAgIH0KICAgICB9CiAKLSNpZiBIQVZFKExTREFUQUJBU0VDT05URVhUKQotICAgIC8vIEZJ WE1FOiBSZW1vdmUgdGhpcyBlbnRpcmUgc2VjdGlvbiB3aGVuIHRoZSBzZWxlY3RvciBvYnNlcnZl RGF0YWJhc2VDaGFuZ2U0V2ViS2l0IGlzIHByZXNlbnQKLSAgICBhdXRvIGNvbnRleHQgPSBbTlND bGFzc0Zyb21TdHJpbmcoQCJMU0RhdGFiYXNlQ29udGV4dCIpIHNoYXJlZERhdGFiYXNlQ29udGV4 dF07Ci0gICAgaWYgKCFbY29udGV4dCByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKG9ic2Vy dmVEYXRhYmFzZUNoYW5nZTRXZWJLaXQ6KV0pIHsKLSAgICAgICAgLy8gTWFwIExhdW5jaCBTZXJ2 aWNlcyBkYXRhYmFzZS4gVGhpcyBzaG91bGQgYmUgZG9uZSBhcyBlYXJseSBhcyBwb3NzaWJsZSwg YXMgdGhlIG1hcHBpbmcgd2lsbCBmYWlsCi0gICAgICAgIC8vIGlmICdjb20uYXBwbGUubHNkLm1h cGRiJyBpcyBiZWluZyBhY2Nlc3NlZCBiZWZvcmUgdGhpcy4KLSAgICAgICAgaWYgKHBhcmFtZXRl cnMubWFwREJFeHRlbnNpb25IYW5kbGUpIHsKLSAgICAgICAgICAgIGF1dG8gZXh0ZW5zaW9uID0g U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlKFdURk1vdmUoKnBhcmFtZXRlcnMubWFwREJFeHRlbnNp b25IYW5kbGUpKTsKLSAgICAgICAgICAgIGJvb2wgb2sgPSBleHRlbnNpb24tPmNvbnN1bWUoKTsK LSAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKLSAgICAgICAgICAgIC8vIFBlcmZv cm0gQVBJIGNhbGxzIHdoaWNoIHdpbGwgY29tbXVuaWNhdGUgd2l0aCB0aGUgZGF0YWJhc2UgbWFw cGluZyBzZXJ2aWNlLCBhbmQgbWFwIHRoZSBkYXRhYmFzZS4KLSAgICAgICAgICAgIGF1dG8gdXRp ID0gYWRvcHRDRihVVFR5cGVDcmVhdGVQcmVmZXJyZWRJZGVudGlmaWVyRm9yVGFnKGtVVFRhZ0Ns YXNzTUlNRVR5cGUsIENGU1RSKCJ0ZXh0L2h0bWwiKSwgMCkpOwotICAgICAgICAgICAgb2sgPSBl eHRlbnNpb24tPnJldm9rZSgpOwotICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChvaywgb2spOwot ICAgICAgICAgICAgQVNTRVJUKFN0cmluZyh1dGkuZ2V0KCkpID09IFN0cmluZyhhZG9wdENGKFVU VHlwZUNyZWF0ZVByZWZlcnJlZElkZW50aWZpZXJGb3JUYWcoa1VUVGFnQ2xhc3NNSU1FVHlwZSwg Q0ZTVFIoInRleHQvaHRtbCIpLCAwKSkuZ2V0KCkpKTsKLSAgICAgICAgfQotICAgIH0KLSNlbmRp ZgogI2lmICFMT0dfRElTQUJMRUQgfHwgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgV2ViQ29y ZTo6aW5pdGlhbGl6ZUxvZ0NoYW5uZWxzSWZOZWNlc3NhcnkocGFyYW1ldGVycy53ZWJDb3JlTG9n Z2luZ0NoYW5uZWxzKTsKICAgICBXZWJLaXQ6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNz YXJ5KHBhcmFtZXRlcnMud2ViS2l0TG9nZ2luZ0NoYW5uZWxzKTsK 406014 2020-08-05 11:15:06 -0700 2020-08-05 11:50:37 -0700 Patch bug-215154-20200805111505.patch text/plain 6490 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjUyOTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA4LTA1ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFJlbW92ZSBvYnNv bGV0ZSBzYW5kYm94IGV4dGVuc2lvbiBhZnRlciByMjY0MTc4CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxNTQKKworICAgICAgICBSZXZpZXdlZCBi eSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIEFmdGVyIHIyNjQxNzgsIHRoZSBjb2RlIHJlbGF0 ZWQgdG8gaXNzdWluZyBhbiBleHRlbnNpb24gdG8gY29tLmFwcGxlLmxzZC5tYXBkYiBpcyBvYnNv bGV0ZSwgYW5kIHNob3VsZCBiZSByZW1vdmVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292 ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFJlc291cmNlcy9TYW5kYm94UHJv ZmlsZXMvaW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYjoKKyAgICAgICAgKiBTaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hh cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFdlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2Nv bS5hcHBsZS5XZWJQcm9jZXNzLnNiLmluOgorCiAyMDIwLTA4LTA1ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEtleWJvYXJkIHNob3J0Y3V0 cyBhbmQgYXJyb3cga2V5IHNjcm9sbGluZyBzdG9wIHdvcmtpbmcgYWZ0ZXIgbmF2aWdhdGluZyB2 aWEgc3dpcGUgZ2VzdHVyZQpJbmRleDogU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFBy b2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuc2IKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2Vi S2l0LldlYkNvbnRlbnQuc2IJKHJldmlzaW9uIDI2NTI5MykKKysrIFNvdXJjZS9XZWJLaXQvUmVz b3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNi CSh3b3JraW5nIGNvcHkpCkBAIC05NjAsNyArOTYwLDYgQEAKICAgICAgICAgICAgICJjb20uYXBw bGUuY29udGFpbmVybWFuYWdlcmQiCiAgICAgICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0aWNk IgogICAgICAgICAgICAgImNvbS5hcHBsZS5pcGhvbmUuYXhzZXJ2ZXItc3lzdGVtd2lkZSIKLSAg ICAgICAgICAgICJjb20uYXBwbGUubHNkLm1hcGRiIgogICAgICAgICAgICAgImNvbS5hcHBsZS5t b2JpbGVhc3NldGQudjIiCiAgICAgICAgICAgICAiY29tLmFwcGxlLm1vYmlsZWdlc3RhbHQueHBj IgogICAgICAgICAgICAgImNvbS5hcHBsZS5uZWhlbHBlciIKSW5kZXg6IFNvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZp c2lvbiAyNjUyOTMpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY5LDcgKzE2OSw2IEBAIHZvaWQgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2QKICNlbmRpZgogCiAjaWYgUExBVEZPUk0o Q09DT0EpCi0gICAgZW5jb2RlciA8PCBtYXBEQkV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVy IDw8IHN5c3RlbUhhc0JhdHRlcnk7CiAgICAgZW5jb2RlciA8PCBzeXN0ZW1IYXNBQzsKICNlbmRp ZgpAQCAtNDU2LDEyICs0NTUsNiBAQCBib29sIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6 OmRlY29kCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIE9wdGlvbmFsPE9wdGlv bmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4+IG1hcERCRXh0ZW5zaW9uSGFuZGxlOwotICAg IGRlY29kZXIgPj4gbWFwREJFeHRlbnNpb25IYW5kbGU7Ci0gICAgaWYgKCFtYXBEQkV4dGVuc2lv bkhhbmRsZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhcmFtZXRlcnMubWFwREJFeHRl bnNpb25IYW5kbGUgPSBXVEZNb3ZlKCptYXBEQkV4dGVuc2lvbkhhbmRsZSk7Ci0KICAgICBPcHRp b25hbDxib29sPiBzeXN0ZW1IYXNCYXR0ZXJ5OwogICAgIGRlY29kZXIgPj4gc3lzdGVtSGFzQmF0 dGVyeTsKICAgICBpZiAoIXN5c3RlbUhhc0JhdHRlcnkpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAy NjUyOTMpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMyw3ICsyMTMsNiBAQCBzdHJ1Y3QgV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycyB7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAg IE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gbWFwREJFeHRlbnNpb25IYW5kbGU7 CiAgICAgYm9vbCBzeXN0ZW1IYXNCYXR0ZXJ5IHsgZmFsc2UgfTsKICAgICBib29sIHN5c3RlbUhh c0FDIHsgZmFsc2UgfTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyNjUyOTMpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC00MjMsMTAgKzQyMyw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBs YXRmb3JtSW5pdGlhbGl6ZVcKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBwYXJhbWV0ZXJzLnN5 c3RlbUhhc0JhdHRlcnkgPSBzeXN0ZW1IYXNCYXR0ZXJ5KCk7CiAgICAgcGFyYW1ldGVycy5zeXN0 ZW1IYXNBQyA9IGNhY2hlZFN5c3RlbUhhc0FDKCkudmFsdWVPcih0cnVlKTsKLQotICAgIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSBtYXBEQkhhbmRsZTsKLSAgICBpZiAoU2FuZGJveEV4dGVuc2lv bjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLmxzZC5tYXBkYiJfcywgV1RG OjpudWxsb3B0LCBtYXBEQkhhbmRsZSwgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0 KSkKLSAgICAgICAgcGFyYW1ldGVycy5tYXBEQkV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUobWFw REJIYW5kbGUpOwogI2VuZGlmCiAKICAgICBpZiAocmVxdWlyZXNDb250YWluZXJNYW5hZ2VyQWNj ZXNzKCkpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJv Y2Vzcy5zYi5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFw cGxlLldlYlByb2Nlc3Muc2IuaW4JKHJldmlzaW9uIDI2NTI5MykKKysrIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpAQCAt OTczLDcgKzk3Myw2IEBACiAgICAgICAgICAgICAiY29tLmFwcGxlLmNmcHJlZnNkLmRhZW1vbiIK ICAgICAgICAgICAgICJjb20uYXBwbGUuY29udGFpbmVybWFuYWdlcmQiCiAgICAgICAgICAgICAi Y29tLmFwcGxlLnRjY2QiCi0gICAgICAgICAgICAiY29tLmFwcGxlLmxzZC5tYXBkYiIKICAgICAg ICAgICAgICJjb20uYXBwbGUuQmx1ZXRvb3RoU2VydmljZXMiCiAKICAgICAgICAgICAgIDs7OyBG SVhNRSgyMDc3MTYpOiBUaGUgZm9sbG93aW5nIHNob3VsZCBiZSByZW1vdmVkIHdoZW4gdGhlIEdQ VSBwcm9jZXNzIGlzIGNvbXBsZXRlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j b2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI2NTI5MykKKysrIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29w eSkKQEAgLTIzNywyNCArMjM3LDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp emVXZWJQcgogICAgICAgICB9CiAgICAgfQogCi0jaWYgSEFWRShMU0RBVEFCQVNFQ09OVEVYVCkK LSAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgZW50aXJlIHNlY3Rpb24gd2hlbiB0aGUgc2VsZWN0 b3Igb2JzZXJ2ZURhdGFiYXNlQ2hhbmdlNFdlYktpdCBpcyBwcmVzZW50Ci0gICAgYXV0byBjb250 ZXh0ID0gW05TQ2xhc3NGcm9tU3RyaW5nKEAiTFNEYXRhYmFzZUNvbnRleHQiKSBzaGFyZWREYXRh YmFzZUNvbnRleHRdOwotICAgIGlmICghW2NvbnRleHQgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3RvcihvYnNlcnZlRGF0YWJhc2VDaGFuZ2U0V2ViS2l0OildKSB7Ci0gICAgICAgIC8vIE1hcCBM YXVuY2ggU2VydmljZXMgZGF0YWJhc2UuIFRoaXMgc2hvdWxkIGJlIGRvbmUgYXMgZWFybHkgYXMg cG9zc2libGUsIGFzIHRoZSBtYXBwaW5nIHdpbGwgZmFpbAotICAgICAgICAvLyBpZiAnY29tLmFw cGxlLmxzZC5tYXBkYicgaXMgYmVpbmcgYWNjZXNzZWQgYmVmb3JlIHRoaXMuCi0gICAgICAgIGlm IChwYXJhbWV0ZXJzLm1hcERCRXh0ZW5zaW9uSGFuZGxlKSB7Ci0gICAgICAgICAgICBhdXRvIGV4 dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZNb3ZlKCpwYXJhbWV0ZXJzLm1h cERCRXh0ZW5zaW9uSGFuZGxlKSk7Ci0gICAgICAgICAgICBib29sIG9rID0gZXh0ZW5zaW9uLT5j b25zdW1lKCk7Ci0gICAgICAgICAgICBBU1NFUlRfVU5VU0VEKG9rLCBvayk7Ci0gICAgICAgICAg ICAvLyBQZXJmb3JtIEFQSSBjYWxscyB3aGljaCB3aWxsIGNvbW11bmljYXRlIHdpdGggdGhlIGRh dGFiYXNlIG1hcHBpbmcgc2VydmljZSwgYW5kIG1hcCB0aGUgZGF0YWJhc2UuCi0gICAgICAgICAg ICBhdXRvIHV0aSA9IGFkb3B0Q0YoVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRh ZyhrVVRUYWdDbGFzc01JTUVUeXBlLCBDRlNUUigidGV4dC9odG1sIiksIDApKTsKLSAgICAgICAg ICAgIG9rID0gZXh0ZW5zaW9uLT5yZXZva2UoKTsKLSAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQo b2ssIG9rKTsKLSAgICAgICAgICAgIEFTU0VSVChTdHJpbmcodXRpLmdldCgpKSA9PSBTdHJpbmco YWRvcHRDRihVVFR5cGVDcmVhdGVQcmVmZXJyZWRJZGVudGlmaWVyRm9yVGFnKGtVVFRhZ0NsYXNz TUlNRVR5cGUsIENGU1RSKCJ0ZXh0L2h0bWwiKSwgMCkpLmdldCgpKSk7Ci0gICAgICAgIH0KLSAg ICB9Ci0jZW5kaWYKICNpZiAhTE9HX0RJU0FCTEVEIHx8ICFSRUxFQVNFX0xPR19ESVNBQkxFRAog ICAgIFdlYkNvcmU6OmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5KHBhcmFtZXRlcnMu d2ViQ29yZUxvZ2dpbmdDaGFubmVscyk7CiAgICAgV2ViS2l0Ojppbml0aWFsaXplTG9nQ2hhbm5l bHNJZk5lY2Vzc2FyeShwYXJhbWV0ZXJzLndlYktpdExvZ2dpbmdDaGFubmVscyk7Cg==