241157 2022-05-31 14:17:42 -0700 Allow decidePolicyForNavigation* decisionHandlers to be called on non-main runloops 2022-06-01 13:15:25 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=241190 InRadar P2 Normal --- 1 achristensen achristensen beidson webkit-bug-importer oldest_to_newest 1873133 0 achristensen 2022-05-31 14:17:42 -0700 It causes strange problems when they aren't. This is what ensureOnMainRunLoop is for. 1873138 1 459909 achristensen 2022-05-31 14:36:05 -0700 Created attachment 459909 Patch 1873230 2 ews-feeder 2022-05-31 22:00:48 -0700 Committed r295080 (251175@main): <https://commits.webkit.org/251175@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459909. 1873231 3 webkit-bug-importer 2022-05-31 22:01:13 -0700 <rdar://problem/94199423> 1873340 4 ryanhaddad 2022-06-01 10:44:59 -0700 This was reverted in https://commits.webkit.org/251190@main due to causing https://bugs.webkit.org/show_bug.cgi?id=241190 1873351 5 459929 achristensen 2022-06-01 11:37:12 -0700 Created attachment 459929 Patch 1873362 6 ews-feeder 2022-06-01 13:15:24 -0700 Committed r295101 (251196@main): <https://commits.webkit.org/251196@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459929. 459909 2022-05-31 14:36:05 -0700 2022-06-01 11:37:10 -0700 Patch bug-241157-20220531143605.patch text/plain 7651 achristensen RnJvbSAxNzFiNjViZWQ2MTM5NTk2Zjc2YjRiY2ZiMjg5OThiNGUzODBlNTM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBUdWUsIDMxIE1heSAyMDIyIDE0OjE3OjUwIC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gQWxsb3cgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbiogZGVjaXNpb25IYW5kbGVycyB0byBi ZQogY2FsbGVkIG9uIG5vbi1tYWluIHJ1bmxvb3BzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNDExNTcKIDxyZGFyOi8vOTQxMzA3MDU+CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCldvdWxkbid0IGl0IGJlIG5pY2UgaWYgYWxsIGFwcHMgdXNlZCB5b3VyIEFQ SXMgZXhhY3RseSBob3cgeW91IHdhbnQgdGhlbSB0bz8KVGhpcyBpcyBub3QgdGhlIGNhc2UuICBQ ZW9wbGUgY2FsbCBkZWNpc2lvbiBoYW5kbGVycyBvbiBub24tbWFpbiB0aHJlYWRzLgpXaGVuIHRo aXMgaGFwcGVucywganVzdCBob3AgdG8gdGhlIG1haW4gdGhyZWFkIHRvIGF2b2lkIHRocmVhZGlu ZyBpc3N1ZXMuCgoqIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0 ZS5tbToKKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UpOgotLS0KIC4u Li9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbSB8IDQ1ICsrKysrKysr KysrLS0tLS0tLS0KIC4uLi9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uQWN0aW9uLm1tICAg ICB8IDI4ICsrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9OYXZpZ2F0aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZp Z2F0aW9uU3RhdGUubW0KaW5kZXggZDgyZGJkNDNlZmJjLi40ODRiYjZjZWNiZjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTU3 NSwxMyArNTc1LDIwIEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQCiAgICAgfTsKIAogICAgIGlm IChkZWxlZ2F0ZUhhc1dlYnBhZ2VQcmVmZXJlbmNlcykgeworICAgICAgICBhdXRvIGRlY2lzaW9u SGFuZGxlciA9IFtkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzID0gV1RG TW92ZShkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKV0gKFdLTmF2aWdh dGlvbkFjdGlvblBvbGljeSBhY3Rpb25Qb2xpY3ksIFdLV2VicGFnZVByZWZlcmVuY2VzICpwcmVm ZXJlbmNlcykgbXV0YWJsZSB7CisgICAgICAgICAgICBlbnN1cmVPbk1haW5SdW5Mb29wKFtkZWNp c2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzID0gV1RGTW92ZShkZWNpc2lvbkhh bmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSwgYWN0aW9uUG9saWN5LCByZXRhaW5lZFBy ZWZlcmVuY2VzID0gUmV0YWluUHRyIHsgcHJlZmVyZW5jZXMgfV0gKCkgbXV0YWJsZSB7CisgICAg ICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyV2l0aFByZWZlcmVuY2VzT3JQb2xpY2llcyhhY3Rp b25Qb2xpY3ksIHJldGFpbmVkUHJlZmVyZW5jZXMuZ2V0KCkpOworICAgICAgICAgICAgfSk7Cisg ICAgICAgIH07CiAgICAgICAgIGlmIChtX25hdmlnYXRpb25TdGF0ZS0+bV9uYXZpZ2F0aW9uRGVs ZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFBy ZWZlcmVuY2VzRGVjaXNpb25IYW5kbGVyKQotICAgICAgICAgICAgW25hdmlnYXRpb25EZWxlZ2F0 ZSB3ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLT5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbjp3cmFwcGVyKG5hdmlnYXRpb25BY3Rpb24pIHByZWZlcmVuY2VzOndyYXBw ZXIoZGVmYXVsdFdlYnNpdGVQb2xpY2llcykgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihX VEZNb3ZlKGRlY2lzaW9uSGFuZGxlcldpdGhQcmVmZXJlbmNlc09yUG9saWNpZXMpKS5nZXQoKV07 CisgICAgICAgICAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6bV9uYXZpZ2F0aW9uU3Rh dGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOndyYXBwZXIobmF2 aWdhdGlvbkFjdGlvbikgcHJlZmVyZW5jZXM6d3JhcHBlcihkZWZhdWx0V2Vic2l0ZVBvbGljaWVz KSBkZWNpc2lvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFdURk1vdmUoZGVjaXNpb25IYW5kbGVyKSku Z2V0KCldOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxl Z2F0ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0 ZS0+bV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246d3JhcHBlcihuYXZp Z2F0aW9uQWN0aW9uKSBwcmVmZXJlbmNlczp3cmFwcGVyKGRlZmF1bHRXZWJzaXRlUG9saWNpZXMp IHVzZXJJbmZvOnVzZXJJbmZvID8gc3RhdGljX2Nhc3Q8aWQ8TlNTZWN1cmVDb2Rpbmc+Pih1c2Vy SW5mby0+d3JhcHBlcigpKSA6IG5pbCBkZWNpc2lvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFdURk1v dmUoZGVjaXNpb25IYW5kbGVyV2l0aFByZWZlcmVuY2VzT3JQb2xpY2llcykpLmdldCgpXTsKKyAg ICAgICAgICAgIFsoaWQ8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVs ZWdhdGUgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uOndyYXBwZXIobmF2aWdhdGlvbkFjdGlvbikgcHJlZmVyZW5jZXM6 d3JhcHBlcihkZWZhdWx0V2Vic2l0ZVBvbGljaWVzKSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRp Y19jYXN0PGlkPE5TU2VjdXJlQ29kaW5nPj4odXNlckluZm8tPndyYXBwZXIoKSkgOiBuaWwgZGVj aXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZNb3ZlKGRlY2lzaW9uSGFuZGxlcikpLmdldCgp XTsKICAgICB9IGVsc2UgewogICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IFtkZWNpc2lv bkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzID0gV1RGTW92ZShkZWNpc2lvbkhhbmRs ZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKV0gKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSBh Y3Rpb25Qb2xpY3kpIG11dGFibGUgewotICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyV2l0aFBy ZWZlcmVuY2VzT3JQb2xpY2llcyhhY3Rpb25Qb2xpY3ksIG5pbCk7CisgICAgICAgICAgICBlbnN1 cmVPbk1haW5SdW5Mb29wKFtkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVz ID0gV1RGTW92ZShkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSwgYWN0 aW9uUG9saWN5XSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBkZWNpc2lvbkhhbmRsZXJX aXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKGFjdGlvblBvbGljeSwgbmlsKTsKKyAgICAgICAgICAg IH0pOwogICAgICAgICB9OwogICAgICAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6bV9u YXZpZ2F0aW9uU3RhdGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u OndyYXBwZXIobmF2aWdhdGlvbkFjdGlvbikgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihX VEZNb3ZlKGRlY2lzaW9uSGFuZGxlcikpLmdldCgpXTsKICAgICB9CkBAIC02NTQsMjQgKzY2MSwy NiBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvblJlc3BvbnNlKFdlYlBhZwogICAgICAgICByZXR1cm47CiAKICAgICBhdXRv IGNoZWNrZXIgPSBDb21wbGV0aW9uSGFuZGxlckNhbGxDaGVja2VyOjpjcmVhdGUobmF2aWdhdGlv bkRlbGVnYXRlLmdldCgpLCBAc2VsZWN0b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uUmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOikpOwotICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUg d2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS0+bV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmln YXRpb25SZXNwb25zZTp3cmFwcGVyKG5hdmlnYXRpb25SZXNwb25zZSkgZGVjaXNpb25IYW5kbGVy Om1ha2VCbG9ja1B0cihbbG9jYWxMaXN0ZW5lciA9IFdURk1vdmUobGlzdGVuZXIpLCBjaGVja2Vy ID0gV1RGTW92ZShjaGVja2VyKV0oV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kgcmVzcG9uc2VQ b2xpY3kpIHsKLSAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNh bGxlZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBjaGVja2VyLT5kaWRDYWxsQ29t cGxldGlvbkhhbmRsZXIoKTsKKyAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6bV9uYXZp Z2F0aW9uU3RhdGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2U6 d3JhcHBlcihuYXZpZ2F0aW9uUmVzcG9uc2UpIGRlY2lzaW9uSGFuZGxlcjptYWtlQmxvY2tQdHIo W2xvY2FsTGlzdGVuZXIgPSBXVEZNb3ZlKGxpc3RlbmVyKSwgY2hlY2tlciA9IFdURk1vdmUoY2hl Y2tlcildKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IHJlc3BvbnNlUG9saWN5KSBtdXRhYmxl IHsKKyAgICAgICAgZW5zdXJlT25NYWluUnVuTG9vcChbcmVzcG9uc2VQb2xpY3ksIGNoZWNrZXIg PSBXVEZNb3ZlKGNoZWNrZXIpLCBsb2NhbExpc3RlbmVyID0gV1RGTW92ZShsb2NhbExpc3RlbmVy KV0geworICAgICAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNh bGxlZCgpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGNoZWNrZXItPmRp ZENhbGxDb21wbGV0aW9uSGFuZGxlcigpOwogCi0gICAgICAgIHN3aXRjaCAocmVzcG9uc2VQb2xp Y3kpIHsKLSAgICAgICAgY2FzZSBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUFsbG93OgotICAg ICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNlKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIHN3aXRjaCAocmVzcG9uc2VQb2xpY3kpIHsKKyAgICAgICAgICAgIGNhc2UgV0tOYXZp Z2F0aW9uUmVzcG9uc2VQb2xpY3lBbGxvdzoKKyAgICAgICAgICAgICAgICBsb2NhbExpc3RlbmVy LT51c2UoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICBjYXNlIFdLTmF2aWdh dGlvblJlc3BvbnNlUG9saWN5Q2FuY2VsOgotICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+aWdu b3JlKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgV0tOYXZpZ2F0aW9u UmVzcG9uc2VQb2xpY3lDYW5jZWw6CisgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+aWdu b3JlKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgY2FzZSBXS05hdmlnYXRp b25SZXNwb25zZVBvbGljeURvd25sb2FkOgotICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+ZG93 bmxvYWQoKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9CisgICAgICAgICAgICBjYXNl IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5RG93bmxvYWQ6CisgICAgICAgICAgICAgICAgbG9j YWxMaXN0ZW5lci0+ZG93bmxvYWQoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSk7CiAgICAgfSkuZ2V0KCldOwogfQogCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb25BY3Rpb24ubW0gYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb25BY3Rpb24ubW0K aW5kZXggZGY3YWE3YzUzMjAxLi44ZjM1ZjQ4OWIwODIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmF2aWdhdGlvbkFjdGlvbi5tbQorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb25BY3Rpb24ubW0KQEAg LTIxNSwzICsyMTUsMzEgQEAgVEVTVChXS05hdmlnYXRpb25BY3Rpb24sIEJsb2JSZXF1ZXN0Qm9k eSkKICAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6bmlsXTsKICAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwogfQorCitURVNUKFdLTmF2aWdhdGlvbkFj dGlvbiwgTm9uTWFpblRocmVhZCkKK3sKKyAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNl cnZlcih7CisgICAgICAgIHsgIi8iX3MsIHsgImhpIl9zIH0gfSwKKyAgICB9KTsKKworICAgIGF1 dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsKKyAgICBbd2ViVmlldyBz ZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIF9fYmxvY2sgYm9vbCBk b25lID0gZmFsc2U7CisgICAgZGVsZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbiA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICphY3Rpb24sIHZvaWQgKF5jb21wbGV0aW9u SGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBkaXNwYXRjaF9h c3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RF RkFVTFQsIDApLCBeeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5QWxsb3cpOworICAgICAgICB9KTsKKyAgICB9OworICAgIGRlbGVnYXRlLmdl dCgpLmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZSA9IF4oV0tOYXZpZ2F0aW9uUmVz cG9uc2UgKmFjdGlvbiwgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShXS05hdmlnYXRpb25SZXNw b25zZVBvbGljeSkpIHsKKyAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X2dsb2Jh bF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9ERUZBVUxULCAwKSwgXnsKKyAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3cpOwor ICAgICAgICB9KTsKKyAgICB9OworICAgIGRlbGVnYXRlLmdldCgpLmRpZEZpbmlzaE5hdmlnYXRp b24gPSBeKFdLV2ViVmlldyAqLCBXS05hdmlnYXRpb24gKikgeworICAgICAgICBkb25lID0gdHJ1 ZTsKKyAgICB9OworCisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6c2VydmVyLnJlcXVlc3QoKV07 CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKK30KLS0gCjIuMzIuMCAoQXBw bGUgR2l0LTEzMikKCg== 459929 2022-06-01 11:37:12 -0700 2022-06-01 13:15:24 -0700 Patch bug-241157-20220601113711.patch text/plain 9767 achristensen RnJvbSBiZmE4ZmRjZDMwMzRmOTA5ZDlmY2M5MzNjZjAyMjkzODQxOWM2Y2YyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IENocmlzdGVuc2VuIDxhY2hyaXN0ZW5zZW5AYXBwbGUu Y29tPgpEYXRlOiBXZWQsIDEgSnVuIDIwMjIgMTE6MzY6MDUgLTA3MDAKU3ViamVjdDogW1BBVENI XSBBbGxvdyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uKiBkZWNpc2lvbkhhbmRsZXJzIHRvIGJl CiBjYWxsZWQgb24gbm9uLW1haW4gcnVubG9vcHMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI0MTE1NwogPHJkYXI6Ly85NDEzMDcwNT4KClJldmlld2VkIGJ5IEJyYWR5 IEVpZHNvbi4KCldvdWxkbid0IGl0IGJlIG5pY2UgaWYgYWxsIGFwcHMgdXNlZCB5b3VyIEFQSXMg ZXhhY3RseSBob3cgeW91IHdhbnQgdGhlbSB0bz8KVGhpcyBpcyBub3QgdGhlIGNhc2UuICBQZW9w bGUgY2FsbCBkZWNpc2lvbiBoYW5kbGVycyBvbiBub24tbWFpbiB0aHJlYWRzLgpXaGVuIHRoaXMg aGFwcGVucywganVzdCBob3AgdG8gdGhlIG1haW4gdGhyZWFkIHRvIGF2b2lkIHRocmVhZGluZyBp c3N1ZXMuCgoqIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5t bToKKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0 aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UpOgotLS0KIC4uLi9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbSB8IDEwMSArKysrKysrKyst LS0tLS0tLS0KIC4uLi9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uQWN0aW9uLm1tICAgICB8 ICAyOCArKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA3OCBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0 aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3Rh dGUubW0KaW5kZXggZDgyZGJkNDNlZmJjLi4yZWQxM2NlMWYwYTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTUzNyw0OCArNTM3 LDQ2IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQCiAgICAgICAgICAgICAgICAgW05TRXhjZXB0 aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIldLV2VicGFnZVBy ZWZlcmVuY2VzLl9jdXN0b21OYXZpZ2F0b3JQbGF0Zm9ybSBtdXN0IGJlIG5pbCBmb3Igc3ViZnJh bWUgbmF2aWdhdGlvbnMuIl07CiAgICAgICAgIH0KIAotICAgICAgICBzd2l0Y2ggKGFjdGlvblBv bGljeSkgewotICAgICAgICBjYXNlIFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93OgotICAg ICAgICBjYXNlIF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd0luTmV3UHJvY2VzczoKLSAg ICAgICAgICAgIHRyeUludGVyY2VwdE5hdmlnYXRpb24oV1RGTW92ZShuYXZpZ2F0aW9uQWN0aW9u KSwgd2ViUGFnZVByb3h5LCBbYWN0aW9uUG9saWN5LCBsb2NhbExpc3RlbmVyID0gV1RGTW92ZShs b2NhbExpc3RlbmVyKSwgd2Vic2l0ZVBvbGljaWVzID0gV1RGTW92ZShhcGlXZWJzaXRlUG9saWNp ZXMpXShib29sIGludGVyY2VwdGVkTmF2aWdhdGlvbikgbXV0YWJsZSB7Ci0gICAgICAgICAgICAg ICAgaWYgKGludGVyY2VwdGVkTmF2aWdhdGlvbikgewotICAgICAgICAgICAgICAgICAgICBsb2Nh bExpc3RlbmVyLT5pZ25vcmUoKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPnVzZSh3ZWJzaXRl UG9saWNpZXMuZ2V0KCksIGFjdGlvblBvbGljeSA9PSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5 QWxsb3dJbk5ld1Byb2Nlc3MgPyBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpZZXMgOiBQ cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyk7Ci0gICAgICAgICAgICB9KTsKLSAgICAg ICAgCi0gICAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIFdLTmF2aWdhdGlvbkFjdGlv blBvbGljeUNhbmNlbDoKLSAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPmlnbm9yZSgpOwotICAg ICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJ T05TX0JFR0lOCi0gICAgICAgIGNhc2UgX1dLTmF2aWdhdGlvbkFjdGlvblBvbGljeURvd25sb2Fk OgotICAgICAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECi0gICAgICAg ICAgICBsb2NhbExpc3RlbmVyLT5kb3dubG9hZCgpOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAg ICAgICAgY2FzZSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3dXaXRob3V0VHJ5aW5nQXBw TGluazoKLSAgICAgICAgICAgIHRyeVNPQXV0aG9yaXphdGlvbihXVEZNb3ZlKG5hdmlnYXRpb25B Y3Rpb24pLCB3ZWJQYWdlUHJveHksIFtsb2NhbExpc3RlbmVyID0gV1RGTW92ZShsb2NhbExpc3Rl bmVyKSwgd2Vic2l0ZVBvbGljaWVzID0gV1RGTW92ZShhcGlXZWJzaXRlUG9saWNpZXMpXSAoYm9v bCBvcHRpbWl6ZWRMb2FkKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG9wdGltaXplZExvYWQpIHsK LSAgICAgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+aWdub3JlKCk7Ci0gICAgICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBs b2NhbExpc3RlbmVyLT51c2Uod2Vic2l0ZVBvbGljaWVzLmdldCgpKTsKLSAgICAgICAgICAgIH0p OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAgICAgZW5zdXJlT25NYWluUnVu TG9vcChbbmF2aWdhdGlvbkFjdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbiksIHdlYlBh Z2VQcm94eSA9IFdURk1vdmUod2ViUGFnZVByb3h5KSwgYWN0aW9uUG9saWN5LCBsb2NhbExpc3Rl bmVyID0gV1RGTW92ZShsb2NhbExpc3RlbmVyKSwgYXBpV2Vic2l0ZVBvbGljaWVzID0gV1RGTW92 ZShhcGlXZWJzaXRlUG9saWNpZXMpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIHN3aXRjaCAo YWN0aW9uUG9saWN5KSB7CisgICAgICAgICAgICBjYXNlIFdLTmF2aWdhdGlvbkFjdGlvblBvbGlj eUFsbG93OgorICAgICAgICAgICAgY2FzZSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3dJ bk5ld1Byb2Nlc3M6CisgICAgICAgICAgICAgICAgdHJ5SW50ZXJjZXB0TmF2aWdhdGlvbihXVEZN b3ZlKG5hdmlnYXRpb25BY3Rpb24pLCB3ZWJQYWdlUHJveHksIFthY3Rpb25Qb2xpY3ksIGxvY2Fs TGlzdGVuZXIgPSBXVEZNb3ZlKGxvY2FsTGlzdGVuZXIpLCB3ZWJzaXRlUG9saWNpZXMgPSBXVEZN b3ZlKGFwaVdlYnNpdGVQb2xpY2llcyldKGJvb2wgaW50ZXJjZXB0ZWROYXZpZ2F0aW9uKSBtdXRh YmxlIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGludGVyY2VwdGVkTmF2aWdhdGlvbikgewor ICAgICAgICAgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+aWdub3JlKCk7CisgICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT51c2Uod2Vic2l0ZVBvbGljaWVzLmdldCgpLCBh Y3Rpb25Qb2xpY3kgPT0gX1dLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93SW5OZXdQcm9jZXNz ID8gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6WWVzIDogUHJvY2Vzc1N3YXBSZXF1ZXN0 ZWRCeUNsaWVudDo6Tm8pOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgICAgICBjYXNlIFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUNhbmNlbDoK KyAgICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT5pZ25vcmUoKTsKKyAgICAgICAgICAgICAg ICBicmVhazsKKworICAgICAgICAgICAgY2FzZSBXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lEb3du bG9hZDoKKyAgICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT5kb3dubG9hZCgpOworICAgICAg ICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBjYXNlIF9XS05hdmlnYXRpb25BY3Rpb25Q b2xpY3lBbGxvd1dpdGhvdXRUcnlpbmdBcHBMaW5rOgorICAgICAgICAgICAgICAgIHRyeVNPQXV0 aG9yaXphdGlvbihXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb24pLCB3ZWJQYWdlUHJveHksIFtsb2Nh bExpc3RlbmVyID0gV1RGTW92ZShsb2NhbExpc3RlbmVyKSwgd2Vic2l0ZVBvbGljaWVzID0gV1RG TW92ZShhcGlXZWJzaXRlUG9saWNpZXMpXSAoYm9vbCBvcHRpbWl6ZWRMb2FkKSB7CisgICAgICAg ICAgICAgICAgICAgIGlmIChvcHRpbWl6ZWRMb2FkKSB7CisgICAgICAgICAgICAgICAgICAgICAg ICBsb2NhbExpc3RlbmVyLT5pZ25vcmUoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgICAgIGxvY2FsTGlz dGVuZXItPnVzZSh3ZWJzaXRlUG9saWNpZXMuZ2V0KCkpOworICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfSAgICAgICAgfSk7CiAgICAgfTsK IAogICAgIGlmIChkZWxlZ2F0ZUhhc1dlYnBhZ2VQcmVmZXJlbmNlcykgewogICAgICAgICBpZiAo bV9uYXZpZ2F0aW9uU3RhdGUtPm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlc0RlY2lzaW9uSGFuZGxl cikKICAgICAgICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRpb25T dGF0ZS0+bV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246d3JhcHBlcihu YXZpZ2F0aW9uQWN0aW9uKSBwcmVmZXJlbmNlczp3cmFwcGVyKGRlZmF1bHRXZWJzaXRlUG9saWNp ZXMpIGRlY2lzaW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoV1RGTW92ZShkZWNpc2lvbkhhbmRsZXJX aXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSkuZ2V0KCldOwogICAgICAgICBlbHNlCi0gICAgICAg ICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0 ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS0+bV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246d3JhcHBlcihuYXZpZ2F0aW9uQWN0aW9uKSBwcmVmZXJlbmNlczp3cmFw cGVyKGRlZmF1bHRXZWJzaXRlUG9saWNpZXMpIHVzZXJJbmZvOnVzZXJJbmZvID8gc3RhdGljX2Nh c3Q8aWQ8TlNTZWN1cmVDb2Rpbmc+Pih1c2VySW5mby0+d3JhcHBlcigpKSA6IG5pbCBkZWNpc2lv bkhhbmRsZXI6bWFrZUJsb2NrUHRyKFdURk1vdmUoZGVjaXNpb25IYW5kbGVyV2l0aFByZWZlcmVu Y2VzT3JQb2xpY2llcykpLmdldCgpXTsKKyAgICAgICAgICAgIFsoaWQ8V0tOYXZpZ2F0aW9uRGVs ZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3Rh dGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOndyYXBwZXIobmF2 aWdhdGlvbkFjdGlvbikgcHJlZmVyZW5jZXM6d3JhcHBlcihkZWZhdWx0V2Vic2l0ZVBvbGljaWVz KSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkPE5TU2VjdXJlQ29kaW5nPj4odXNl ckluZm8tPndyYXBwZXIoKSkgOiBuaWwgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZN b3ZlKGRlY2lzaW9uSGFuZGxlcldpdGhQcmVmZXJlbmNlc09yUG9saWNpZXMpKS5nZXQoKV07CiAg ICAgfSBlbHNlIHsKICAgICAgICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBbZGVjaXNpb25IYW5k bGVyV2l0aFByZWZlcmVuY2VzT3JQb2xpY2llcyA9IFdURk1vdmUoZGVjaXNpb25IYW5kbGVyV2l0 aFByZWZlcmVuY2VzT3JQb2xpY2llcyldIChXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kgYWN0aW9u UG9saWN5KSBtdXRhYmxlIHsKICAgICAgICAgICAgIGRlY2lzaW9uSGFuZGxlcldpdGhQcmVmZXJl bmNlc09yUG9saWNpZXMoYWN0aW9uUG9saWN5LCBuaWwpOwpAQCAtNjU0LDI0ICs2NTIsMjUgQEAg dm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25SZXNwb25zZShXZWJQYWcKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBjaGVj a2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3JlYXRlKG5hdmlnYXRpb25EZWxl Z2F0ZS5nZXQoKSwgQHNlbGVjdG9yKHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJl c3BvbnNlOmRlY2lzaW9uSGFuZGxlcjopKTsKLSAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZp ZXc6bV9uYXZpZ2F0aW9uU3RhdGUtPm1fd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u UmVzcG9uc2U6d3JhcHBlcihuYXZpZ2F0aW9uUmVzcG9uc2UpIGRlY2lzaW9uSGFuZGxlcjptYWtl QmxvY2tQdHIoW2xvY2FsTGlzdGVuZXIgPSBXVEZNb3ZlKGxpc3RlbmVyKSwgY2hlY2tlciA9IFdU Rk1vdmUoY2hlY2tlcildKFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IHJlc3BvbnNlUG9saWN5 KSB7CisgICAgW25hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLT5t X3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOndyYXBwZXIobmF2aWdh dGlvblJlc3BvbnNlKSBkZWNpc2lvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFtsb2NhbExpc3RlbmVy ID0gV1RGTW92ZShsaXN0ZW5lciksIGNoZWNrZXIgPSBXVEZNb3ZlKGNoZWNrZXIpXShXS05hdmln YXRpb25SZXNwb25zZVBvbGljeSByZXNwb25zZVBvbGljeSkgbXV0YWJsZSB7CiAgICAgICAgIGlm IChjaGVja2VyLT5jb21wbGV0aW9uSGFuZGxlckhhc0JlZW5DYWxsZWQoKSkKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgY2hlY2tlci0+ZGlkQ2FsbENvbXBsZXRpb25IYW5kbGVyKCk7Ci0K LSAgICAgICAgc3dpdGNoIChyZXNwb25zZVBvbGljeSkgewotICAgICAgICBjYXNlIFdLTmF2aWdh dGlvblJlc3BvbnNlUG9saWN5QWxsb3c6Ci0gICAgICAgICAgICBsb2NhbExpc3RlbmVyLT51c2Uo KTsKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgV0tOYXZpZ2F0aW9uUmVzcG9u c2VQb2xpY3lDYW5jZWw6Ci0gICAgICAgICAgICBsb2NhbExpc3RlbmVyLT5pZ25vcmUoKTsKLSAg ICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xp Y3lEb3dubG9hZDoKLSAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPmRvd25sb2FkKCk7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgfQorICAgICAgICBlbnN1cmVPbk1haW5SdW5Mb29wKFty ZXNwb25zZVBvbGljeSwgbG9jYWxMaXN0ZW5lciA9IFdURk1vdmUobG9jYWxMaXN0ZW5lcildIHsK KyAgICAgICAgICAgIHN3aXRjaCAocmVzcG9uc2VQb2xpY3kpIHsKKyAgICAgICAgICAgIGNhc2Ug V0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3lBbGxvdzoKKyAgICAgICAgICAgICAgICBsb2NhbExp c3RlbmVyLT51c2UoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgY2Fz ZSBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUNhbmNlbDoKKyAgICAgICAgICAgICAgICBsb2Nh bExpc3RlbmVyLT5pZ25vcmUoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAg ICAgY2FzZSBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeURvd25sb2FkOgorICAgICAgICAgICAg ICAgIGxvY2FsTGlzdGVuZXItPmRvd25sb2FkKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0pOwogICAgIH0pLmdldCgpXTsKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uQWN0aW9u Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uQWN0 aW9uLm1tCmluZGV4IGRmN2FhN2M1MzIwMS4uOGYzNWY0ODliMDgyIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb25BY3Rpb24ubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uQWN0aW9u Lm1tCkBAIC0yMTUsMyArMjE1LDMxIEBAIFRFU1QoV0tOYXZpZ2F0aW9uQWN0aW9uLCBCbG9iUmVx dWVzdEJvZHkpCiAgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOm5pbF07 CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKIH0KKworVEVTVChXS05hdmln YXRpb25BY3Rpb24sIE5vbk1haW5UaHJlYWQpCit7CisgICAgVGVzdFdlYktpdEFQSTo6SFRUUFNl cnZlciBzZXJ2ZXIoeworICAgICAgICB7ICIvIl9zLCB7ICJoaSJfcyB9IH0sCisgICAgfSk7CisK KyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXdd KTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CisgICAgW3dl YlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKyAgICBfX2Jsb2Nr IGJvb2wgZG9uZSA9IGZhbHNlOworICAgIGRlbGVnYXRlLmdldCgpLmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb24gPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCB2b2lkICheY29t cGxldGlvbkhhbmRsZXIpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkpIHsKKyAgICAgICAgZGlz cGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklP UklUWV9ERUZBVUxULCAwKSwgXnsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdLTmF2 aWdhdGlvbkFjdGlvblBvbGljeUFsbG93KTsKKyAgICAgICAgfSk7CisgICAgfTsKKyAgICBkZWxl Z2F0ZS5nZXQoKS5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UgPSBeKFdLTmF2aWdh dGlvblJlc3BvbnNlICphY3Rpb24sIHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlcikoV0tOYXZpZ2F0 aW9uUmVzcG9uc2VQb2xpY3kpKSB7CisgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl dF9nbG9iYWxfcXVldWUoRElTUEFUQ0hfUVVFVUVfUFJJT1JJVFlfREVGQVVMVCwgMCksIF57Cisg ICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeUFs bG93KTsKKyAgICAgICAgfSk7CisgICAgfTsKKyAgICBkZWxlZ2F0ZS5nZXQoKS5kaWRGaW5pc2hO YXZpZ2F0aW9uID0gXihXS1dlYlZpZXcgKiwgV0tOYXZpZ2F0aW9uICopIHsKKyAgICAgICAgZG9u ZSA9IHRydWU7CisgICAgfTsKKworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnNlcnZlci5yZXF1 ZXN0KCldOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Cit9Ci0tIAoyLjMy LjAgKEFwcGxlIEdpdC0xMzIpCgo=