210505 2020-04-14 11:20:42 -0700 [iOS] Content filtering needs access to the frontboard service 2020-04-14 13:27:31 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham ggaren webkit-bug-importer oldest_to_newest 1641462 0 pvollan 2020-04-14 11:20:42 -0700 Content filtering in the WebContent process needs access to the frontboard service on iOS. Issue an extension to this service when content filtering is enabled. 1641463 1 webkit-bug-importer 2020-04-14 11:21:01 -0700 <rdar://problem/61781351> 1641505 2 396451 pvollan 2020-04-14 12:43:02 -0700 Created attachment 396451 Patch 1641515 3 396451 ggaren 2020-04-14 13:13:02 -0700 Comment on attachment 396451 Patch r=me 1641517 4 396451 pvollan 2020-04-14 13:15:54 -0700 Comment on attachment 396451 Patch Thanks for reviewing! 1641521 5 ews-feeder 2020-04-14 13:27:30 -0700 Committed r260093: <https://trac.webkit.org/changeset/260093> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396451. 396451 2020-04-14 12:43:02 -0700 2020-04-14 13:27:31 -0700 Patch bug-210505-20200414124301.patch text/plain 12231 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjAwODEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTE0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDb250ZW50IGZpbHRl cmluZyBuZWVkcyBhY2Nlc3MgdG8gdGhlIGZyb250Ym9hcmQgc2VydmljZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNTA1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udGVudCBmaWx0ZXJpbmcgaW4g dGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBuZWVkcyBhY2Nlc3MgdG8gdGhlIGZyb250Ym9hcmQgc2Vy dmljZSBvbiBpT1MuIElzc3VlIGFuIGV4dGVuc2lvbgorICAgICAgICB0byB0aGlzIHNlcnZpY2Ug d2hlbiBjb250ZW50IGZpbHRlcmluZyBpcyBlbmFibGVkLgorCisgICAgICAgIEFQSSB0ZXN0OiBX ZWJLaXQuV2ViRmlsdGVyRmVhdHVyZUhhc0Zyb250Ym9hcmRTZXJ2aWNlQWNjZXNzCisKKyAgICAg ICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAg ICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAq IFdlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAyMC0wNC0xNCAg QnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmplY3RlZEJ1 bmRsZSBwYXJhbWV0ZXJzIG9mdGVuIG5lZWQgaW5pdGlhbGl6YXRpb24gZnVuY3Rpb24gY2FsbGVk IGJlZm9yZSB1bmFyY2hpdmluZwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDI2MDA3OCkKKysr IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTksNiArMTU5LDcgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzOjplbmNvZAogI2lmIFBMQVRGT1JNKElPUykKICAgICBlbmNvZGVyIDw8IGNvbXBp bGVyU2VydmljZUV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8IGNvbnRlbnRGaWx0ZXJF eHRlbnNpb25IYW5kbGU7CisgICAgZW5jb2RlciA8PCBmcm9udGJvYXJkU2VydmljZUV4dGVuc2lv bkhhbmRsZTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTQzMCw2ICs0 MzEsMTIgQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZAogICAgIGlm ICghY29udGVudEZpbHRlckV4dGVuc2lvbkhhbmRsZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIHBhcmFtZXRlcnMuY29udGVudEZpbHRlckV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUoKmNv bnRlbnRGaWx0ZXJFeHRlbnNpb25IYW5kbGUpOworCisgICAgT3B0aW9uYWw8T3B0aW9uYWw8U2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlPj4gZnJvbnRib2FyZFNlcnZpY2VFeHRlbnNpb25IYW5kbGU7 CisgICAgZGVjb2RlciA+PiBmcm9udGJvYXJkU2VydmljZUV4dGVuc2lvbkhhbmRsZTsKKyAgICBp ZiAoIWZyb250Ym9hcmRTZXJ2aWNlRXh0ZW5zaW9uSGFuZGxlKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgcGFyYW1ldGVycy5mcm9udGJvYXJkU2VydmljZUV4dGVuc2lvbkhhbmRsZSA9IFdU Rk1vdmUoKmZyb250Ym9hcmRTZXJ2aWNlRXh0ZW5zaW9uSGFuZGxlKTsKICNlbmRpZgogCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2MDA3OCkKKysrIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTk5LDYgKzE5OSw3IEBAIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICNpZiBQTEFURk9STShJT1MpCiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlPiBjb21waWxlclNlcnZpY2VFeHRlbnNpb25IYW5kbGU7CiAgICAgT3B0aW9uYWw8 U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBjb250ZW50RmlsdGVyRXh0ZW5zaW9uSGFuZGxlOwor ICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gZnJvbnRib2FyZFNlcnZpY2VF eHRlbnNpb25IYW5kbGU7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29s Q29jb2EubW0JKHJldmlzaW9uIDI2MDA3OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyMCw2ICs0MjAs MTAgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplVwogICAgICAgICBT YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgaGFuZGxlOwogICAgICAgICBTYW5kYm94RXh0ZW5zaW9u OjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUudWlraXQudmlld3NlcnZpY2Uu Y29tLmFwcGxlLldlYkNvbnRlbnRGaWx0ZXIucmVtb3RlVUkiLCBXVEY6Om51bGxvcHQsIGhhbmRs ZSk7CiAgICAgICAgIHBhcmFtZXRlcnMuY29udGVudEZpbHRlckV4dGVuc2lvbkhhbmRsZSA9IFdU Rk1vdmUoaGFuZGxlKTsKKworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgZnJvbnRi b2FyZFNlcnZpY2VFeHRlbnNpb25IYW5kbGU7CisgICAgICAgIGlmIChTYW5kYm94RXh0ZW5zaW9u OjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUuZnJvbnRib2FyZC5zeXN0ZW1h cHBzZXJ2aWNlcyIsIFdURjo6bnVsbG9wdCwgZnJvbnRib2FyZFNlcnZpY2VFeHRlbnNpb25IYW5k bGUpKQorICAgICAgICAgICAgcGFyYW1ldGVycy5mcm9udGJvYXJkU2VydmljZUV4dGVuc2lvbkhh bmRsZSA9IFdURk1vdmUoZnJvbnRib2FyZFNlcnZpY2VFeHRlbnNpb25IYW5kbGUpOwogICAgIH0K ICNlbmRpZgogICAgIApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlBy b2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j b2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNjAwNzgpCisrKyBTb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y ODMsNiArMjgzLDkgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgog ICAgIGlmIChwYXJhbWV0ZXJzLmNvbnRlbnRGaWx0ZXJFeHRlbnNpb25IYW5kbGUpCiAgICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5jb250ZW50 RmlsdGVyRXh0ZW5zaW9uSGFuZGxlKTsKICAgICBQYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRl cjo6c2V0SGFzQ29uc3VtZWRTYW5kYm94RXh0ZW5zaW9uKHBhcmFtZXRlcnMuY29udGVudEZpbHRl ckV4dGVuc2lvbkhhbmRsZS5oYXNWYWx1ZSgpKTsKKworICAgIGlmIChwYXJhbWV0ZXJzLmZyb250 Ym9hcmRTZXJ2aWNlRXh0ZW5zaW9uSGFuZGxlKQorICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpj b25zdW1lUGVybWFuZW50bHkoKnBhcmFtZXRlcnMuZnJvbnRib2FyZFNlcnZpY2VFeHRlbnNpb25I YW5kbGUpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjYwMDkw KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MjAtMDQtMTQgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIENvbnRlbnQgZmlsdGVyaW5nIG5lZWRzIGFjY2VzcyB0byB0aGUgZnJvbnRib2FyZCBz ZXJ2aWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTA1MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1dlYkZpbHRlci5tbTogQWRkZWQu CisgICAgICAgIChpc01hbmFnZWRTZXNzaW9uTWV0aG9kT3ZlcnJpZGUpOgorICAgICAgICAoVEVT VCk6CisKIDIwMjAtMDQtMTQgIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29t PgogCiAgICAgICAgIE1ha2UgV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50cyBjYWxscyB0byBh Y2Nlc3NpYmlsaXR5U2V0VmFsdWUgcnVuIG9uIEFYIHNlY29uZGFyeSB0aHJlYWQuCkluZGV4OiBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMjYwMDc4KQorKysgVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29w eSkKQEAgLTg5Myw2ICs4OTMsNyBAQAogCQlDMTVDQkIzMDIzRjFGRjFBMDAzMDBDQzcgLyogQmFj a2xpZ2h0TGV2ZWxOb3RpZmljYXRpb24ubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBDMTVDQkIyRjIzRjFGRjFBMDAzMDBDQzcgLyogQmFja2xpZ2h0TGV2 ZWxOb3RpZmljYXRpb24ubW0gKi87IH07CiAJCUMxNUNCQjNGMjNGQjE3N0EwMDMwMENDNyAvKiBQ cmVmZXJlbmNlQ2hhbmdlcy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEMxNUNCQjNFMjNGQjE3N0EwMDMwMENDNyAvKiBQcmVmZXJlbmNlQ2hhbmdlcy5t bSAqLzsgfTsKIAkJQzE2OTJEQ0EyM0QxMERBRTAwNkU4OEY3IC8qIEJhdHRlcnkubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMTY5MkRDOTIzRDEwREFF MDA2RTg4RjcgLyogQmF0dGVyeS5tbSAqLzsgfTsKKwkJQzFGRjlFREIyNDQ2NDRGMDAwODM5QUU0 IC8qIFdlYkZpbHRlci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEMxRkY5RURBMjQ0NjQ0RjAwMDgzOUFFNCAvKiBXZWJGaWx0ZXIubW0gKi87IH07CiAJ CUMyMEY4OEE3MjI5NUI5NjcwMEQ2MTBGQSAvKiBDb3JlVGV4dC5mcmFtZXdvcmsgaW4gRnJhbWV3 b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMjBGODhBNjIyOTVCOTY3 MDBENjEwRkEgLyogQ29yZVRleHQuZnJhbWV3b3JrICovOyB9OwogCQlDMjJGQTMyQjIyOEY4NzA4 MDA5RDc5ODggLyogVGV4dFdpZHRoLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQzIyRkEzMkEyMjhGODcwODAwOUQ3OTg4IC8qIFRleHRXaWR0aC5tbSAq LzsgfTsKIAkJQzIyRkEzMkQyMjhGOEFFQjAwOUQ3OTg4IC8qIFRleHRXaWR0aC5odG1sIGluIENv cHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMyMkZBMzJD MjI4Rjg3N0EwMDlENzk4OCAvKiBUZXh0V2lkdGguaHRtbCAqLzsgfTsKQEAgLTI0ODIsNiArMjQ4 Myw3IEBACiAJCUMxNUNCQjNFMjNGQjE3N0EwMDMwMENDNyAvKiBQcmVmZXJlbmNlQ2hhbmdlcy5t bSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFByZWZlcmVuY2VDaGFu Z2VzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMTY5MkRDOTIzRDEwREFFMDA2 RTg4RjcgLyogQmF0dGVyeS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEJhdHRlcnkubW07IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxRDhFRTIxMjAyOEU4RTMwMDhFQjE0MSAvKiBX ZWJQcm9jZXNzVGVybWluYXRlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBw YXRoID0gV2ViUHJvY2Vzc1Rlcm1pbmF0ZS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJQzFGRjlFREEyNDQ2NDRGMDAwODM5QUU0IC8qIFdlYkZpbHRlci5tbSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNw cDsgcGF0aCA9IFdlYkZpbHRlci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzIw Rjg4QTYyMjk1Qjk2NzAwRDYxMEZBIC8qIENvcmVUZXh0LmZyYW1ld29yayAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBu YW1lID0gQ29yZVRleHQuZnJhbWV3b3JrOyBwYXRoID0gU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jr cy9Db3JlVGV4dC5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSBTREtST09UOyB9OwogCQlDMjJGQTMy QTIyOEY4NzA4MDA5RDc5ODggLyogVGV4dFdpZHRoLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g VGV4dFdpZHRoLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMjJGQTMyQzIyOEY4 NzdBMDA5RDc5ODggLyogVGV4dFdpZHRoLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSBUZXh0V2lkdGguaHRtbDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTI5NDUsNiArMjk0Nyw3IEBACiAJCQkJQzE1 Q0JCM0UyM0ZCMTc3QTAwMzAwQ0M3IC8qIFByZWZlcmVuY2VDaGFuZ2VzLm1tICovLAogCQkJCUMx NDlENTRGMjQyRTk4NDQwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tICovLAogCQkJCTBGMTM5 RTc1MUE0MjNBNTMwMEY1OTBGNSAvKiBXZWFrT2JqQ1B0ci5tbSAqLywKKwkJCQlDMUZGOUVEQTI0 NDY0NEYwMDA4MzlBRTQgLyogV2ViRmlsdGVyLm1tICovLAogCQkJKTsKIAkJCW5hbWUgPSBjb2Nv YTsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC01MTY3LDYgKzUxNzAsNyBAQAogCQkJ CTgzMEYyRTBDMjA5QTZBOEUwMEQzNkZGMSAvKiBXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0 ZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDODNFMDRDMUQwQTY0MTgwMEZFQkNGMyAvKiBXZWJD b3JlTlNVUkxTZXNzaW9uLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJNTdBNzk4NTcyMjRBQjM0RTAw QTdGNkYxIC8qIFdlYkNyeXB0b01hc3RlcktleS5tbSBpbiBTb3VyY2VzICovLAorCQkJCUMxRkY5 RURCMjQ0NjQ0RjAwMDgzOUFFNCAvKiBXZWJGaWx0ZXIubW0gaW4gU291cmNlcyAqLywKIAkJCQk1 Qzk3M0Y1QzFGNThFRjhCMDAzNTlDMjcgLyogV2ViR0xQb2xpY3kubW0gaW4gU291cmNlcyAqLywK IAkJCQk3Q0NFN0VBQjFBNDExQTI0MDA0NDdDNEMgLyogV2ViS2l0QWdub3N0aWNUZXN0Lm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJNTE3MTRFQjgxQ0Y4Q0ExNzAwNDcyM0M0IC8qIFdlYlByb2Nlc3NL aWxsSURCQ2xlYW51cC5tbSBpbiBTb3VyY2VzICovLApJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvV2ViRmlsdGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L1dlYkZpbHRlci5tbQkobm9uZXhpc3RlbnQpCisrKyBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9XZWJGaWx0ZXIubW0JKHdvcmtpbmcgY29weSkKQEAg LTAsMCArMSw2OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKworI2ltcG9y dCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKKyNpbXBvcnQgIlRlc3RXS1dlYlZpZXcuaCIKKyNpbXBv cnQgPFdlYktpdC9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L19XS1By b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oPgorCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYg V0tfSEFWRV9DX1NQSQorCisjaW1wb3J0IDxwYWwvc3BpL2NvY29hL1dlYkZpbHRlckV2YWx1YXRv clNQSS5oPgorI2ltcG9ydCA8d3RmL1NvZnRMaW5raW5nLmg+CisKK1NPRlRfTElOS19QUklWQVRF X0ZSQU1FV09SSyhXZWJDb250ZW50QW5hbHlzaXMpOworU09GVF9MSU5LX0NMQVNTKFdlYkNvbnRl bnRBbmFseXNpcywgV2ViRmlsdGVyRXZhbHVhdG9yKTsKKworc3RhdGljIElNUCBpc01hbmFnZWRT ZXNzaW9uTWV0aG9kT3JpZ2luYWwgPSBuaWw7CisKK3N0YXRpYyBCT09MIGlzTWFuYWdlZFNlc3Np b25NZXRob2RPdmVycmlkZShpZCBzZWxmLCBTRUwgc2VsZWN0b3IpCit7CisgICAgcmV0dXJuIFlF UzsKK30KKworVEVTVChXZWJLaXQsIFdlYkZpbHRlckZlYXR1cmVIYXNGcm9udGJvYXJkU2Vydmlj ZUFjY2VzcykKK3sKKyAgICBNZXRob2QgaXNNYW5hZ2VkU2Vzc2lvbk1ldGhvZCA9IGNsYXNzX2dl dENsYXNzTWV0aG9kKGdldFdlYkZpbHRlckV2YWx1YXRvckNsYXNzKCksIEBzZWxlY3Rvcihpc01h bmFnZWRTZXNzaW9uKSk7CisgICAgQVNTRVJUKGlzTWFuYWdlZFNlc3Npb25NZXRob2QpOworICAg IGlzTWFuYWdlZFNlc3Npb25NZXRob2RPcmlnaW5hbCA9IG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlv bihpc01hbmFnZWRTZXNzaW9uTWV0aG9kLCAoSU1QKWlzTWFuYWdlZFNlc3Npb25NZXRob2RPdmVy cmlkZSk7CisgICAgQVNTRVJUKGlzTWFuYWdlZFNlc3Npb25NZXRob2RPcmlnaW5hbCk7CisKKyAg ICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFk b3B0V0soVGVzdFdlYktpdEFQSTo6VXRpbDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxl VGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRCdW5kbGVUZXN0IikpOworICAgIGNvbmZpZ3VyYXRpb24u Z2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAsIDMwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9u LmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxv YWRUZXN0UGFnZU5hbWVkOkAic2ltcGxlIl07CisKKyAgICBhdXRvIHNhbmRib3hBY2Nlc3MgPSBb Jl0geworICAgICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAIndpbmRvdy5pbnRlcm5hbHMuaGFzU2FuZGJveE1hY2hMb29rdXBBY2Nlc3NUb0dsb2JhbE5h bWUoJ2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCcsICdjb20uYXBwbGUuZnJvbnRib2FyZC5z eXN0ZW1hcHBzZXJ2aWNlcycpIl0uYm9vbFZhbHVlOworICAgIH07CisKKyAgICBBU1NFUlRfVFJV RShzYW5kYm94QWNjZXNzKCkpOworfQorCisjZW5kaWYK