227674 2021-07-04 13:10:53 -0700 [Live Text] Extraneous spaces when copying or translating Chinese and Japanese text in WebKit 2021-07-06 12:37:42 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1774735 0 wenson_hsieh 2021-07-04 13:10:53 -0700 rdar://79669807 1774736 1 432867 wenson_hsieh 2021-07-04 13:54:07 -0700 Created attachment 432867 For EWS 1775000 2 432949 wenson_hsieh 2021-07-06 11:23:14 -0700 Created attachment 432949 Use WTF::String instead of NSString 1775002 3 wenson_hsieh 2021-07-06 11:24:30 -0700 (Over Slack, Tim recommended using WTF::String's functionality instead of NSString). 1775045 4 ews-feeder 2021-07-06 12:37:38 -0700 Committed r279609 (239431@main): <https://commits.webkit.org/239431@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432949. 432867 2021-07-04 13:54:07 -0700 2021-07-06 11:23:11 -0700 For EWS bug-227674-20210704135406.patch text/plain 15534 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFlNzExMmQwMjg1YjE5 MTY5Mjg4OGQyYjUwN2E2ZmIxMDg5NDUwZC4uM2VkZmIzMzY4N2JiOGExYWNjYzk0NmY2ODg3Zjgx YjFhNmQ5NDQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA3LTA0ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtMaXZlIFRleHRd IEV4dHJhbmVvdXMgc3BhY2VzIHdoZW4gY29weWluZyBvciB0cmFuc2xhdGluZyBDaGluZXNlIGFu ZCBKYXBhbmVzZSB0ZXh0IGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Njc0CisgICAgICAgIHJkYXI6Ly83OTY2OTgwNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlZSBXZWJLaXQvQ2hh bmdlTG9nIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbWFnZXMvdGV4 dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LXRleHQtd2l0aG91dC1sZWFkaW5nLXdoaXRlc3Bh Y2UuaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MRWxlbWVudDo6dXBkYXRlV2l0aFRleHRSZWNvZ25pdGlvblJlc3VsdCk6CisKKyAg ICAgICAgRm9yIGVhY2ggcmVjb2duaXplZCB3b3JkIGluIHRleHQsIG9ubHkgYXBwZW5kIGEgdHJh aWxpbmcgbmV3bGluZSBpbiB0aGUgdGV4dCBjb250ZW50IG9mIHRoZSB0ZXh0IGNvbnRhaW5lcgor ICAgICAgICBlbGVtZW50IGlmIGBoYXNMZWFkaW5nV2hpdGVzcGFjZWAgaXMgc2V0LiBEcml2ZS1i eSBmaXg6IGFkZGl0aW9uYWxseSByZW1vdmUgbG9naWMgdG8gYXBwZW5kIGEgbGluZSBicmVhayB3 aGVuCisgICAgICAgIGNvbXB1dGluZyBhbmQgYXBwbHlpbmcgQ1NTIHRyYW5zZm9ybXMgdG8gdGV4 dCBjb250YWluZXIgZWxlbWVudHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9UZXh0UmVjb2duaXRp b25SZXN1bHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbldvcmREYXRhOjpU ZXh0UmVjb2duaXRpb25Xb3JkRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UmVjb2duaXRp b25Xb3JkRGF0YTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25p dGlvbldvcmREYXRhOjpkZWNvZGUpOgorCisgICAgICAgIEFkZCBhIHBlci13b3JkIGBoYXNMZWFk aW5nV2hpdGVzcGFjZWAgZmxhZy4KKworICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Om1ha2VEYXRhRm9yTGluZSk6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuaDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5pZGw6CisKIDIwMjEtMDct MDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIERpc2FibGUg cmVsYXkgZm9yIFVEUCBzb2NrZXRzIHdoZW4gbm90IG5lZWRlZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA4YjEwZGRi MzlmZjZlNjA4NDc3NjNhZmQ0NzJlMjllM2Y3NDAyODRjLi5hMGI1NWUxMzI5ZjM4Mzg1YTdjYTQ3 NTgzNjA1YTFmZDQ4ZGU4MGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA3LTA0 ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtMaXZl IFRleHRdIEV4dHJhbmVvdXMgc3BhY2VzIHdoZW4gY29weWluZyBvciB0cmFuc2xhdGluZyBDaGlu ZXNlIGFuZCBKYXBhbmVzZSB0ZXh0IGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Njc0CisgICAgICAgIHJkYXI6Ly83OTY2OTgwNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gaW5q ZWN0aW5nIExpdmUgVGV4dCBpbnRvIGltYWdlcywgd2UgY3VycmVudGx5IGFzc3VtZSB0aGF0IGFs bCBwaWVjZXMgb2YgcmVjb2duaXplZCB0ZXh0IGZyb20gVmlzaW9uS2l0IGFyZQorICAgICAgICBz ZXBhcmF0ZWQgYnkgc3BhY2VzLiBVcG9uIHNlbGVjdGluZyBKYXBhbmVzZSBvciBDaGluZXNlIHRl eHQsIHRoaXMgY2F1c2VzIHRleHQgc2VsZWN0aW9ucyB0byBpbmNsdWRlIGV4dHJhbmVvdXMKKyAg ICAgICAgc3BhY2VzIGJldHdlZW4gd29yZHMuCisKKyAgICAgICAgVG8gZml4IHRoaXMsIHdlIGFk ZCBhIGJpdCBmb3IgZWFjaCBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YSwgdG8gaW5kaWNhdGUgd2hl dGhlciB0aGF0IHdvcmQgc2hvdWxkIGJlIGZvbGxvd2VkIGJ5CisgICAgICAgIHdoaXRlc3BhY2Ug aW4gdGhlIGltYWdlIG92ZXJsYXkuIFdoZW4gY29udmVydGluZyBWS1dLVGV4dEluZm8gaW50byBU ZXh0UmVjb2duaXRpb25Xb3JkRGF0YSwgd2UgdGhlbiBzZXQgdGhpcyBiaXQKKyAgICAgICAgdG8g YHRydWVgIG9ubHkgaWYgdGhlIHdvcmQgaXMgdGhlIGZpcnN0IG9uIGEgbGluZSBvZiB0ZXh0IHRo YXQgaXMgcHJlY2VkZWQgYnkgYW5vdGhlciBsaW5lLCBvciB0aGVyZSBleGlzdHMKKyAgICAgICAg d2hpdGVzcGFjZSBiZXR3ZWVuIHRoZSB3b3JkIGFuZCB0aGUgcHJldmlvdXMgd29yZCBvbiB0aGUg c2FtZSBsaW5lLgorCisgICAgICAgICogUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRp bGl0aWVzLm1tOgorICAgICAgICAoV2ViS2l0OjptYWtlVGV4dFJlY29nbml0aW9uUmVzdWx0KToK KwogMjAyMS0wNy0wMyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TXSBBdWdtZW50IC1fd2ViVmlldzpkaWROb3RIYW5kbGVUYXBBc01lYW5pbmdm dWxDbGlja0F0UG9pbnQ6IHRvIGluY2x1ZGUgbWVhbmluZ2Z1bCB0YXBzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEVsZW1lbnQuY3BwCmluZGV4IGYwZjEzYjQ3OWExNWE4OGM4NDY2Nzc1MDFjMWQ0YmI5MDll YTFkNjUuLjVkOTVmMjcwZGE3ODFiM2Y0MTIxMDc5OWQxZDM2ZDEwNzU4NWVlZjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCkBAIC0xMzQ3LDcgKzEzNDcsNyBAQCB2b2lkIEhUTUxF bGVtZW50Ojp1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KGNvbnN0IFRleHRSZWNvZ25p dGlvblJlc3VsdCYgcgogCiAgICAgc3RydWN0IFRleHRSZWNvZ25pdGlvbkxpbmVFbGVtZW50cyB7 CiAgICAgICAgIFJlZjxIVE1MRGl2RWxlbWVudD4gbGluZTsKLSAgICAgICAgVmVjdG9yPFJlZjxI VE1MRGl2RWxlbWVudD4+IGNoaWxkcmVuOworICAgICAgICBWZWN0b3I8UmVmPEhUTUxFbGVtZW50 Pj4gY2hpbGRyZW47CiAgICAgfTsKIAogICAgIHN0cnVjdCBUZXh0UmVjb2duaXRpb25FbGVtZW50 cyB7CkBAIC0xNDM1LDcgKzE0MzUsNyBAQCB2b2lkIEhUTUxFbGVtZW50Ojp1cGRhdGVXaXRoVGV4 dFJlY29nbml0aW9uUmVzdWx0KGNvbnN0IFRleHRSZWNvZ25pdGlvblJlc3VsdCYgcgogICAgICAg ICAgICAgICAgIGF1dG8gdGV4dENvbnRhaW5lciA9IEhUTUxEaXZFbGVtZW50OjpjcmVhdGUoZG9j dW1lbnQoKSk7CiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5lci0+Y2xhc3NMaXN0KCkuYWRk KGltYWdlT3ZlcmxheVRleHRDbGFzcyk7CiAgICAgICAgICAgICAgICAgbGluZUNvbnRhaW5lci0+ YXBwZW5kQ2hpbGQodGV4dENvbnRhaW5lcik7Ci0gICAgICAgICAgICAgICAgdGV4dENvbnRhaW5l ci0+YXBwZW5kQ2hpbGQoVGV4dDo6Y3JlYXRlKGRvY3VtZW50KCksIG1ha2VTdHJpbmcoJ1xuJywg Y2hpbGQudGV4dCkpKTsKKyAgICAgICAgICAgICAgICB0ZXh0Q29udGFpbmVyLT5hcHBlbmRDaGls ZChUZXh0OjpjcmVhdGUoZG9jdW1lbnQoKSwgY2hpbGQuaGFzTGVhZGluZ1doaXRlc3BhY2UgPyBt YWtlU3RyaW5nKCdcbicsIGNoaWxkLnRleHQpIDogY2hpbGQudGV4dCkpOwogICAgICAgICAgICAg ICAgIGxpbmVFbGVtZW50cy5jaGlsZHJlbi51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZSh0ZXh0Q29u dGFpbmVyKSk7CiAgICAgICAgICAgICB9CiAKQEAgLTE1NjcsOCArMTU2Nyw2IEBAIHZvaWQgSFRN TEVsZW1lbnQ6OnVwZGF0ZVdpdGhUZXh0UmVjb2duaXRpb25SZXN1bHQoY29uc3QgVGV4dFJlY29n bml0aW9uUmVzdWx0JiByCiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5lci0+c2V0SW5saW5l U3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdFVzZXJTZWxlY3QsIENTU1ZhbHVlQWxsKTsK ICAgICAgICAgfQogCi0gICAgICAgIGxpbmVDb250YWluZXItPmFwcGVuZENoaWxkKEhUTUxCUkVs ZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCgpKSk7Ci0KICAgICAgICAgaWYgKGRvY3VtZW50KCkuaXNJ bWFnZURvY3VtZW50KCkpCiAgICAgICAgICAgICBsaW5lQ29udGFpbmVyLT5zZXRJbmxpbmVTdHls ZVByb3BlcnR5KENTU1Byb3BlcnR5Q3Vyc29yLCBDU1NWYWx1ZVRleHQpOwogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKaW5kZXggOGMw YzFlZTI0NzNiMTg0ZmZjYjJhZWI4ZWJjODdhMDE4NTc3M2MxNS4uY2ZjN2MxZjI0ODU3Nzg0ZDNm ODQ1MGJiMWFjOTI1NjA1NGRmYmRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v VGV4dFJlY29nbml0aW9uUmVzdWx0LmgKQEAgLTM4LDE0ICszOCwxNiBAQCBPQkpDX0NMQVNTIERE U2Nhbm5lclJlc3VsdDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFRleHRSZWNvZ25p dGlvbldvcmREYXRhIHsKLSAgICBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YShjb25zdCBTdHJpbmcm IHRoZVRleHQsIEZsb2F0UXVhZCYmIHF1YWQpCisgICAgVGV4dFJlY29nbml0aW9uV29yZERhdGEo Y29uc3QgU3RyaW5nJiB0aGVUZXh0LCBGbG9hdFF1YWQmJiBxdWFkLCBib29sIGxlYWRpbmdXaGl0 ZXNwYWNlKQogICAgICAgICA6IHRleHQodGhlVGV4dCkKICAgICAgICAgLCBub3JtYWxpemVkUXVh ZChXVEZNb3ZlKHF1YWQpKQorICAgICAgICAsIGhhc0xlYWRpbmdXaGl0ZXNwYWNlKGxlYWRpbmdX aGl0ZXNwYWNlKQogICAgIHsKICAgICB9CiAKICAgICBTdHJpbmcgdGV4dDsKICAgICBGbG9hdFF1 YWQgbm9ybWFsaXplZFF1YWQ7CisgICAgYm9vbCBoYXNMZWFkaW5nV2hpdGVzcGFjZSB7IHRydWUg fTsKIAogICAgIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBj b25zdDsKICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgc3RkOjpvcHRpb25hbDxU ZXh0UmVjb2duaXRpb25Xb3JkRGF0YT4gZGVjb2RlKERlY29kZXImKTsKQEAgLTU1LDYgKzU3LDcg QEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YTo6 ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGMKIHsKICAgICBlbmNvZGVyIDw8IHRleHQ7CiAgICAg ZW5jb2RlciA8PCBub3JtYWxpemVkUXVhZDsKKyAgICBlbmNvZGVyIDw8IGhhc0xlYWRpbmdXaGl0 ZXNwYWNlOwogfQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9wdGlvbmFsPFRleHRS ZWNvZ25pdGlvbldvcmREYXRhPiBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YTo6ZGVjb2RlKERlY29k ZXImIGRlY29kZXIpCkBAIC02OSw3ICs3MiwxMiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBz dGQ6Om9wdGlvbmFsPFRleHRSZWNvZ25pdGlvbldvcmREYXRhPiBUZXh0UmVjb2duaXRpb25Xbwog ICAgIGlmICghbm9ybWFsaXplZFF1YWQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAK LSAgICByZXR1cm4ge3sgV1RGTW92ZSgqdGV4dCksIFdURk1vdmUoKm5vcm1hbGl6ZWRRdWFkKSB9 fTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IGhhc0xlYWRpbmdXaGl0ZXNwYWNlOworICAgIGRl Y29kZXIgPj4gaGFzTGVhZGluZ1doaXRlc3BhY2U7CisgICAgaWYgKCFoYXNMZWFkaW5nV2hpdGVz cGFjZSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgIHJldHVybiB7eyBXVEZN b3ZlKCp0ZXh0KSwgV1RGTW92ZSgqbm9ybWFsaXplZFF1YWQpLCAqaGFzTGVhZGluZ1doaXRlc3Bh Y2UgfX07CiB9CiAKIHN0cnVjdCBUZXh0UmVjb2duaXRpb25MaW5lRGF0YSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggYjQ5NGNlYTZlNWE4MDQ4MmI5Mjc0Y2ZlNDZlM2Ri ZjQ1ZTlmY2JhYS4uYjljMjkwYTdjNjVhZTAyNmZhMTY4OTdkOWUxZjMzYmM3ZDkwMzFjZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNTY3Niw3ICs1Njc2LDcgQEAgc3Rh dGljIFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhIG1ha2VEYXRhRm9yTGluZShjb25zdCBJbnRlcm5h bHM6OkltYWdlT3ZlcmxheUxpbmUKICAgICByZXR1cm4gewogICAgICAgICBnZXRRdWFkPEludGVy bmFsczo6SW1hZ2VPdmVybGF5TGluZT4obGluZSksCiAgICAgICAgIGxpbmUuY2hpbGRyZW4ubWFw KFtdKGF1dG8mIHRleHRDaGlsZCkgLT4gVGV4dFJlY29nbml0aW9uV29yZERhdGEgewotICAgICAg ICAgICAgcmV0dXJuIHsgdGV4dENoaWxkLnRleHQsIGdldFF1YWQ8SW50ZXJuYWxzOjpJbWFnZU92 ZXJsYXlUZXh0Pih0ZXh0Q2hpbGQpIH07CisgICAgICAgICAgICByZXR1cm4geyB0ZXh0Q2hpbGQu dGV4dCwgZ2V0UXVhZDxJbnRlcm5hbHM6OkltYWdlT3ZlcmxheVRleHQ+KHRleHRDaGlsZCksIHRl eHRDaGlsZC5oYXNMZWFkaW5nV2hpdGVzcGFjZSB9OwogICAgICAgICB9KQogICAgIH07CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oIGIvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCA4OWUyZTU2ZjQyNzExOWQ5ZGZjNWExMzQ2 NWRmYzk3NGMzMTJmZTMxLi5hMDI0NTlkMDdkMTY0YmQzN2M4YWIzZGM1MzYxYTFjOTI4NzUzOGUy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTg4Myw2ICs4ODMsNyBAQCBwdWJs aWM6CiAgICAgICAgIFJlZlB0cjxET01Qb2ludFJlYWRPbmx5PiB0b3BSaWdodDsKICAgICAgICAg UmVmUHRyPERPTVBvaW50UmVhZE9ubHk+IGJvdHRvbVJpZ2h0OwogICAgICAgICBSZWZQdHI8RE9N UG9pbnRSZWFkT25seT4gYm90dG9tTGVmdDsKKyAgICAgICAgYm9vbCBoYXNMZWFkaW5nV2hpdGVz cGFjZSB7IHRydWUgfTsKIAogICAgICAgICB+SW1hZ2VPdmVybGF5VGV4dCgpOwogICAgIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXggZjJhM2RmMjdmZmRmNWFiMTNkMmFk ZTQyOTY1Y2FlZDQ0YjNiNjU4My4uZjI3OTE5M2ZjMjI2NTg4NjMwMTA2MTI5ZjFlNzEzYzcyMjIx ZDNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtMjU5LDYgKzI1OSw3 IEBAIGVudW0gVHJlZVR5cGUgewogICAgIHJlcXVpcmVkIERPTVBvaW50UmVhZE9ubHkgdG9wUmln aHQ7CiAgICAgcmVxdWlyZWQgRE9NUG9pbnRSZWFkT25seSBib3R0b21SaWdodDsKICAgICByZXF1 aXJlZCBET01Qb2ludFJlYWRPbmx5IGJvdHRvbUxlZnQ7CisgICAgYm9vbGVhbiBoYXNMZWFkaW5n V2hpdGVzcGFjZSA9IHRydWU7CiB9OwogCiBbCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL2NvY29hL1RleHRSZWNvZ25pdGlvblV0aWxpdGllcy5tbSBiL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCmluZGV4IDFjM2NlNmU4 NGU5NjEyZDA3ZWVhZGIwZjllOGU2M2JkZTVhNTZjYWIuLmM2NmMxNzQwZDM2NmE0ZDU4MTNkN2Vh OGYxNmUzMzBkMDQ4YzA1M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vY29j b2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCkBAIC00NywxMCArNDcsNiBAQCBA aW50ZXJmYWNlIFZLSW1hZ2VBbmFseXNpcyAoU3RhZ2luZ183Nzk3ODc0NSkKIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCByZWFkb25seSkgTlNBcnJheTxpZCA8VktXS0RhdGFEZXRlY3RvckluZm8+PiAq dGV4dERhdGFEZXRlY3RvcnM7CiBAZW5kCiAKLUBpbnRlcmZhY2UgVktXS1RleHRJbmZvIChTdGFn aW5nXzc3MDg2MTA1KQotQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU0FycmF5PFZL V0tUZXh0SW5mbyAqPiAqY2hpbGRyZW47Ci1AZW5kCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTczLDE2ICs2OSw0MSBAQCBUZXh0UmVjb2duaXRp b25SZXN1bHQgbWFrZVRleHRSZWNvZ25pdGlvblJlc3VsdChWS0ltYWdlQW5hbHlzaXMgKmFuYWx5 c2lzKQogICAgIE5TQXJyYXk8VktXS1RleHRJbmZvICo+ICphbGxMaW5lcyA9IGFuYWx5c2lzLmFs bExpbmVzOwogICAgIFRleHRSZWNvZ25pdGlvblJlc3VsdCByZXN1bHQ7CiAgICAgcmVzdWx0Lmxp bmVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoYWxsTGluZXMuY291bnQpOwotICAgIGZvciAoVktX S1RleHRJbmZvICpsaW5lIGluIGFsbExpbmVzKSB7CisKKyAgICBib29sIGlzRmlyc3RMaW5lID0g dHJ1ZTsKKyAgICBhdXRvIHdoaXRlc3BhY2VDaGFyYWN0ZXJTZXQgPSBOU0NoYXJhY3RlclNldC53 aGl0ZXNwYWNlQ2hhcmFjdGVyU2V0OworICAgIGZvciAoVktXS0xpbmVJbmZvICpsaW5lIGluIGFs bExpbmVzKSB7CiAgICAgICAgIFZlY3RvcjxUZXh0UmVjb2duaXRpb25Xb3JkRGF0YT4gY2hpbGRy ZW47Ci0gICAgICAgIGlmIChbbGluZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGNoaWxk cmVuKV0pIHsKLSAgICAgICAgICAgIE5TQXJyYXk8VktXS1RleHRJbmZvICo+ICp2a0NoaWxkcmVu ID0gbGluZS5jaGlsZHJlbjsKLSAgICAgICAgICAgIGNoaWxkcmVuLnJlc2VydmVJbml0aWFsQ2Fw YWNpdHkodmtDaGlsZHJlbi5jb3VudCk7Ci0gICAgICAgICAgICBmb3IgKFZLV0tUZXh0SW5mbyAq Y2hpbGQgaW4gdmtDaGlsZHJlbikKLSAgICAgICAgICAgICAgICBjaGlsZHJlbi51bmNoZWNrZWRB cHBlbmQoeyBjaGlsZC5zdHJpbmcsIGZsb2F0UXVhZChjaGlsZC5xdWFkKSB9KTsKLSAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICBjaGlsZHJlbi5hcHBlbmQoeyBsaW5lLnN0cmluZywgZmxvYXRR dWFkKGxpbmUucXVhZCkgfSk7CisgICAgICAgIE5TQXJyYXk8VktXS1RleHRJbmZvICo+ICp2a0No aWxkcmVuID0gbGluZS5jaGlsZHJlbjsKKyAgICAgICAgY2hpbGRyZW4ucmVzZXJ2ZUluaXRpYWxD YXBhY2l0eSh2a0NoaWxkcmVuLmNvdW50KTsKKworICAgICAgICBOU1N0cmluZyAqbGluZVRleHQg PSBsaW5lLnN0cmluZzsKKyAgICAgICAgYXV0byBzZWFyY2hSYW5nZSA9IE5TTWFrZVJhbmdlKDAs IGxpbmVUZXh0Lmxlbmd0aCk7CisgICAgICAgIGZvciAoVktXS1RleHRJbmZvICpjaGlsZCBpbiB2 a0NoaWxkcmVuKSB7CisgICAgICAgICAgICBpZiAoIXNlYXJjaFJhbmdlLmxlbmd0aCkgeworICAg ICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBhdXRvIG1hdGNoUmFuZ2UgPSBbbGlu ZVRleHQgcmFuZ2VPZlN0cmluZzpjaGlsZC5zdHJpbmcgb3B0aW9uczowIHJhbmdlOnNlYXJjaFJh bmdlXTsKKyAgICAgICAgICAgIGlmIChtYXRjaFJhbmdlLmxvY2F0aW9uID09IE5TTm90Rm91bmQp IHsKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgYm9vbCBoYXNMZWFkaW5n V2hpdGVzcGFjZSA9IChbJl0geworICAgICAgICAgICAgICAgIGlmIChtYXRjaFJhbmdlLmxvY2F0 aW9uID09IHNlYXJjaFJhbmdlLmxvY2F0aW9uKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4g IWlzRmlyc3RMaW5lICYmICFzZWFyY2hSYW5nZS5sb2NhdGlvbjsKKworICAgICAgICAgICAgICAg IGF1dG8gdGV4dEJlZm9yZU1hdGNoID0gW2xpbmVUZXh0IHN1YnN0cmluZ1dpdGhSYW5nZTpOU01h a2VSYW5nZShzZWFyY2hSYW5nZS5sb2NhdGlvbiwgbWF0Y2hSYW5nZS5sb2NhdGlvbiAtIHNlYXJj aFJhbmdlLmxvY2F0aW9uKV07CisgICAgICAgICAgICAgICAgcmV0dXJuIFt0ZXh0QmVmb3JlTWF0 Y2ggcmFuZ2VPZkNoYXJhY3RlckZyb21TZXQ6d2hpdGVzcGFjZUNoYXJhY3RlclNldF0ubG9jYXRp b24gIT0gTlNOb3RGb3VuZDsKKyAgICAgICAgICAgIH0pKCk7CisgICAgICAgICAgICBzZWFyY2hS YW5nZS5sb2NhdGlvbiA9IG1hdGNoUmFuZ2UubG9jYXRpb24gKyBtYXRjaFJhbmdlLmxlbmd0aDsK KyAgICAgICAgICAgIHNlYXJjaFJhbmdlLmxlbmd0aCA9IGxpbmVUZXh0Lmxlbmd0aCAtIHNlYXJj aFJhbmdlLmxvY2F0aW9uOworICAgICAgICAgICAgY2hpbGRyZW4udW5jaGVja2VkQXBwZW5kKHsg Y2hpbGQuc3RyaW5nLCBmbG9hdFF1YWQoY2hpbGQucXVhZCksIGhhc0xlYWRpbmdXaGl0ZXNwYWNl IH0pOworICAgICAgICB9CiAgICAgICAgIHJlc3VsdC5saW5lcy51bmNoZWNrZWRBcHBlbmQoeyBm bG9hdFF1YWQobGluZS5xdWFkKSwgV1RGTW92ZShjaGlsZHJlbikgfSk7CisgICAgICAgIGlzRmly c3RMaW5lID0gZmFsc2U7CiAgICAgfQogCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDVlOWJkMTdiNjA4MDllOGE3ZWMzMWY3NDUyODVlZWQ4YTlhNjQyZTguLjdhYTQ5ZTYzMjk5 YWE5ZTJiNjEwNGIxZjc3NzQ1ZTU0OWM2OTJjMjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAy MS0wNy0wNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAg ICBbTGl2ZSBUZXh0XSBFeHRyYW5lb3VzIHNwYWNlcyB3aGVuIGNvcHlpbmcgb3IgdHJhbnNsYXRp bmcgQ2hpbmVzZSBhbmQgSmFwYW5lc2UgdGV4dCBpbiBXZWJLaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzY3NAorICAgICAgICByZGFyOi8vNzk2 Njk4MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgYSBsYXlvdXQgdGVzdCB0byB2ZXJpZnkgdGhhdCBubyBleHRyYW5lb3VzIHNwYWNlcyBhcmUg aW5zZXJ0ZWQgd2hlbiBpbmplY3RpbmcgcmVjb2duaXplZCB0ZXh0IGludG8gaW1hZ2VzCisgICAg ICAgIHdpdGhvdXQgbGVhZGluZyB3aGl0ZXNwYWNlLgorCisgICAgICAgICogZmFzdC9pbWFnZXMv dGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LXRleHQtd2l0aG91dC1sZWFkaW5nLXdoaXRl c3BhY2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ltYWdlcy90ZXh0LXJl Y29nbml0aW9uL2ltYWdlLW92ZXJsYXktdGV4dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS5o dG1sOiBBZGRlZC4KKwogMjAyMS0wNy0wMyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBdWdtZW50IC1fd2ViVmlldzpkaWROb3RIYW5kbGVU YXBBc01lYW5pbmdmdWxDbGlja0F0UG9pbnQ6IHRvIGluY2x1ZGUgbWVhbmluZ2Z1bCB0YXBzCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdl LW92ZXJsYXktdGV4dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92ZXJsYXktdGV4 dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjU2 NWY1MjY4NDEwNjdiMzg3NWYxODZmMDcwNDBjYTg1MWMyNzRlMAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS10 ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0ZXNwYWNlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUg QEAKK1BBU1MgaW5wdXQudmFsdWUgaXMgImZvb2JhciBiYXoiCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LXRleHQtd2l0aG91dC1s ZWFkaW5nLXdoaXRlc3BhY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVj b2duaXRpb24vaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0ZXNwYWNlLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNGNlZDA0Yjg5Mjc4MWZjZTBmMzgzMzQzYjU5MWFkNmJkNzQxMGI3NQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRp b24vaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0ZXNwYWNlLmh0bWwKQEAg LTAsMCArMSw2NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2lt ZyB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiAwOwor fQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9Ii4uL3Jlc291cmNlcy9ncmVl bi00MDB4NDAwLnBuZyI+PC9pbWc+Cis8aW5wdXQ+PC9pbnB1dD4KKzxzY3JpcHQ+CithZGRFdmVu dExpc3RlbmVyKCJsb2FkIiwgKCkgPT4geworICAgIGNvbnN0IGltYWdlID0gZG9jdW1lbnQucXVl cnlTZWxlY3RvcigiaW1nIik7CisgICAgaW50ZXJuYWxzLmluc3RhbGxJbWFnZU92ZXJsYXkoaW1h Z2UsIFsKKyAgICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRP bmx5KDAsIDApLAorICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgx LCAwKSwKKyAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMSwg MC41KSwKKyAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLCAw LjUpLAorICAgICAgICAgICAgY2hpbGRyZW46IFsKKyAgICAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgICAgIHRleHQgOiAiZm9vIiwKKyAgICAgICAgICAgICAgICAgICAgdG9wTGVmdCA6 IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDApLAorICAgICAgICAgICAgICAgICAgICB0b3BSaWdo dCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuMywgMCksCisgICAgICAgICAgICAgICAgICAgIGJv dHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMC4zLCAwLjUpLAorICAgICAgICAgICAg ICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC41KSwKKyAgICAg ICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdGV4 dCA6ICJiYXIiLAorICAgICAgICAgICAgICAgICAgICB0b3BMZWZ0IDogbmV3IERPTVBvaW50UmVh ZE9ubHkoMC4zLCAwKSwKKyAgICAgICAgICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9p bnRSZWFkT25seSgwLjcsIDApLAorICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5l dyBET01Qb2ludFJlYWRPbmx5KDAuNywgMC41KSwKKyAgICAgICAgICAgICAgICAgICAgYm90dG9t TGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuMywgMC41KSwKKyAgICAgICAgICAgICAgICAg ICAgaGFzTGVhZGluZ1doaXRlc3BhY2U6IGZhbHNlLAorICAgICAgICAgICAgICAgIH0sCisgICAg ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0ZXh0IDogImJheiIsCisgICAgICAg ICAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcsIDApLAorICAg ICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEsIDApLAor ICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDEs IDAuNSksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFk T25seSgwLjcsIDAuNSksCisgICAgICAgICAgICAgICAgICAgIGhhc0xlYWRpbmdXaGl0ZXNwYWNl OiB0cnVlLAorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIF0sCisgICAgICAgIH0KKyAg ICBdKTsKKworICAgIGdldFNlbGVjdGlvbigpLnNlbGVjdEFsbENoaWxkcmVuKGludGVybmFscy5z aGFkb3dSb290KGltYWdlKS5nZXRFbGVtZW50QnlJZCgiaW1hZ2Utb3ZlcmxheSIpKTsKKyAgICB0 ZXN0UnVubmVyLmV4ZWNDb21tYW5kKCJDb3B5Iik7CisKKyAgICBpbnB1dCA9IGRvY3VtZW50LnF1 ZXJ5U2VsZWN0b3IoImlucHV0Iik7CisgICAgaW5wdXQuZm9jdXMoKTsKKyAgICB0ZXN0UnVubmVy LmV4ZWNDb21tYW5kKCJQYXN0ZSIpOworCisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJpbnB1 dC52YWx1ZSIsICJmb29iYXIgYmF6Iik7Cit9KTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 432949 2021-07-06 11:23:14 -0700 2021-07-06 12:37:40 -0700 Use WTF::String instead of NSString bug-227674-20210706112313.patch text/plain 15315 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY2OGY3ZGEzYjU4ZmU1 NmRmODNlZDg1NDc4NmQ1MTU0MWUzMjUzNS4uMzI2YjRiZjA0YjY1OGQ2YWUzZDMyNWMzNWE1MzUw ODZiOTgyNWMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA3LTA0ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtMaXZlIFRleHRd IEV4dHJhbmVvdXMgc3BhY2VzIHdoZW4gY29weWluZyBvciB0cmFuc2xhdGluZyBDaGluZXNlIGFu ZCBKYXBhbmVzZSB0ZXh0IGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Njc0CisgICAgICAgIHJkYXI6Ly83OTY2OTgwNworCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgU2VlIFdlYktpdC9DaGFuZ2VM b2cgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICBUZXN0OiBmYXN0L2ltYWdlcy90ZXh0LXJl Y29nbml0aW9uL2ltYWdlLW92ZXJsYXktdGV4dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS5o dG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxFbGVtZW50Ojp1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KToKKworICAgICAg ICBGb3IgZWFjaCByZWNvZ25pemVkIHdvcmQgaW4gdGV4dCwgb25seSBhcHBlbmQgYSB0cmFpbGlu ZyBuZXdsaW5lIGluIHRoZSB0ZXh0IGNvbnRlbnQgb2YgdGhlIHRleHQgY29udGFpbmVyCisgICAg ICAgIGVsZW1lbnQgaWYgYGhhc0xlYWRpbmdXaGl0ZXNwYWNlYCBpcyBzZXQuIERyaXZlLWJ5IGZp eDogYWRkaXRpb25hbGx5IHJlbW92ZSBsb2dpYyB0byBhcHBlbmQgYSBsaW5lIGJyZWFrIHdoZW4K KyAgICAgICAgY29tcHV0aW5nIGFuZCBhcHBseWluZyBDU1MgdHJhbnNmb3JtcyB0byB0ZXh0IGNv bnRhaW5lciBlbGVtZW50cy4KKworICAgICAgICAqIHBsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJl c3VsdC5oOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFJlY29nbml0aW9uV29yZERhdGE6OlRleHRS ZWNvZ25pdGlvbldvcmREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRSZWNvZ25pdGlvbldv cmREYXRhOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFJlY29nbml0aW9u V29yZERhdGE6OmRlY29kZSk6CisKKyAgICAgICAgQWRkIGEgcGVyLXdvcmQgYGhhc0xlYWRpbmdX aGl0ZXNwYWNlYCBmbGFnLgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bWFrZURhdGFGb3JMaW5lKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVy bmFscy5oOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMS0wNy0wNSAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBMaXZlIFRl eHQgc2hvdWxkIG5vdCBiZSB2aXNpYmxlIGluIHZpZGVvIHRodW1ibmFpbCBpbWFnZXMgYmVoaW5k ICJTa2lwIEFkIiBidXR0b24gb24gWW91VHViZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBhMmJkM2Q1MjhiODg5NWVi ZGI2MzZmZmRlNjk0Y2E1OGVkYjkzODYyLi44YTQ5YTNkMjUyNjUxZDZmY2I2ZTE4MDgyNjI5YzJm OTkzNzg3NTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA3LTA0ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtMaXZlIFRleHRdIEV4 dHJhbmVvdXMgc3BhY2VzIHdoZW4gY29weWluZyBvciB0cmFuc2xhdGluZyBDaGluZXNlIGFuZCBK YXBhbmVzZSB0ZXh0IGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI3Njc0CisgICAgICAgIHJkYXI6Ly83OTY2OTgwNworCisgICAgICAg IFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgV2hlbiBpbmplY3RpbmcgTGl2ZSBU ZXh0IGludG8gaW1hZ2VzLCB3ZSBjdXJyZW50bHkgYXNzdW1lIHRoYXQgYWxsIHBpZWNlcyBvZiBy ZWNvZ25pemVkIHRleHQgZnJvbSBWaXNpb25LaXQgYXJlCisgICAgICAgIHNlcGFyYXRlZCBieSBz cGFjZXMuIFVwb24gc2VsZWN0aW5nIEphcGFuZXNlIG9yIENoaW5lc2UgdGV4dCwgdGhpcyBjYXVz ZXMgdGV4dCBzZWxlY3Rpb25zIHRvIGluY2x1ZGUgZXh0cmFuZW91cworICAgICAgICBzcGFjZXMg YmV0d2VlbiB3b3Jkcy4KKworICAgICAgICBUbyBmaXggdGhpcywgd2UgYWRkIGEgYml0IGZvciBl YWNoIFRleHRSZWNvZ25pdGlvbldvcmREYXRhLCB0byBpbmRpY2F0ZSB3aGV0aGVyIHRoYXQgd29y ZCBzaG91bGQgYmUgZm9sbG93ZWQgYnkKKyAgICAgICAgd2hpdGVzcGFjZSBpbiB0aGUgaW1hZ2Ug b3ZlcmxheS4gV2hlbiBjb252ZXJ0aW5nIFZLV0tUZXh0SW5mbyBpbnRvIFRleHRSZWNvZ25pdGlv bldvcmREYXRhLCB3ZSB0aGVuIHNldCB0aGlzIGJpdAorICAgICAgICB0byBgdHJ1ZWAgb25seSBp ZiB0aGUgd29yZCBpcyB0aGUgZmlyc3Qgb24gYSBsaW5lIG9mIHRleHQgdGhhdCBpcyBwcmVjZWRl ZCBieSBhbm90aGVyIGxpbmUsIG9yIHRoZXJlIGV4aXN0cworICAgICAgICB3aGl0ZXNwYWNlIGJl dHdlZW4gdGhlIHdvcmQgYW5kIHRoZSBwcmV2aW91cyB3b3JkIG9uIHRoZSBzYW1lIGxpbmUuCisK KyAgICAgICAgKiBQbGF0Zm9ybS9jb2NvYS9UZXh0UmVjb2duaXRpb25VdGlsaXRpZXMubW06Cisg ICAgICAgIChXZWJLaXQ6Om1ha2VUZXh0UmVjb2duaXRpb25SZXN1bHQpOgorCiAyMDIxLTA3LTA1 ICBBbGV4YW5kZXIgTWlraGF5bGVua28gIDxhbGV4bUBnbm9tZS5vcmc+CiAKICAgICAgICAgW0dU S10gS2luZXRpYyBzY3JvbGxpbmcgaW50ZXJmZXJlcyB3aXRoIGdlc3R1cmVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnQuY3BwCmluZGV4IGYwZjEzYjQ3OWExNWE4OGM4NDY2Nzc1MDFjMWQ0YmI5 MDllYTFkNjUuLjVkOTVmMjcwZGE3ODFiM2Y0MTIxMDc5OWQxZDM2ZDEwNzU4NWVlZjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3BwCkBAIC0xMzQ3LDcgKzEzNDcsNyBAQCB2b2lkIEhU TUxFbGVtZW50Ojp1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KGNvbnN0IFRleHRSZWNv Z25pdGlvblJlc3VsdCYgcgogCiAgICAgc3RydWN0IFRleHRSZWNvZ25pdGlvbkxpbmVFbGVtZW50 cyB7CiAgICAgICAgIFJlZjxIVE1MRGl2RWxlbWVudD4gbGluZTsKLSAgICAgICAgVmVjdG9yPFJl ZjxIVE1MRGl2RWxlbWVudD4+IGNoaWxkcmVuOworICAgICAgICBWZWN0b3I8UmVmPEhUTUxFbGVt ZW50Pj4gY2hpbGRyZW47CiAgICAgfTsKIAogICAgIHN0cnVjdCBUZXh0UmVjb2duaXRpb25FbGVt ZW50cyB7CkBAIC0xNDM1LDcgKzE0MzUsNyBAQCB2b2lkIEhUTUxFbGVtZW50Ojp1cGRhdGVXaXRo VGV4dFJlY29nbml0aW9uUmVzdWx0KGNvbnN0IFRleHRSZWNvZ25pdGlvblJlc3VsdCYgcgogICAg ICAgICAgICAgICAgIGF1dG8gdGV4dENvbnRhaW5lciA9IEhUTUxEaXZFbGVtZW50OjpjcmVhdGUo ZG9jdW1lbnQoKSk7CiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5lci0+Y2xhc3NMaXN0KCku YWRkKGltYWdlT3ZlcmxheVRleHRDbGFzcyk7CiAgICAgICAgICAgICAgICAgbGluZUNvbnRhaW5l ci0+YXBwZW5kQ2hpbGQodGV4dENvbnRhaW5lcik7Ci0gICAgICAgICAgICAgICAgdGV4dENvbnRh aW5lci0+YXBwZW5kQ2hpbGQoVGV4dDo6Y3JlYXRlKGRvY3VtZW50KCksIG1ha2VTdHJpbmcoJ1xu JywgY2hpbGQudGV4dCkpKTsKKyAgICAgICAgICAgICAgICB0ZXh0Q29udGFpbmVyLT5hcHBlbmRD aGlsZChUZXh0OjpjcmVhdGUoZG9jdW1lbnQoKSwgY2hpbGQuaGFzTGVhZGluZ1doaXRlc3BhY2Ug PyBtYWtlU3RyaW5nKCdcbicsIGNoaWxkLnRleHQpIDogY2hpbGQudGV4dCkpOwogICAgICAgICAg ICAgICAgIGxpbmVFbGVtZW50cy5jaGlsZHJlbi51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZSh0ZXh0 Q29udGFpbmVyKSk7CiAgICAgICAgICAgICB9CiAKQEAgLTE1NjcsOCArMTU2Nyw2IEBAIHZvaWQg SFRNTEVsZW1lbnQ6OnVwZGF0ZVdpdGhUZXh0UmVjb2duaXRpb25SZXN1bHQoY29uc3QgVGV4dFJl Y29nbml0aW9uUmVzdWx0JiByCiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5lci0+c2V0SW5s aW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eVdlYmtpdFVzZXJTZWxlY3QsIENTU1ZhbHVlQWxs KTsKICAgICAgICAgfQogCi0gICAgICAgIGxpbmVDb250YWluZXItPmFwcGVuZENoaWxkKEhUTUxC UkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCgpKSk7Ci0KICAgICAgICAgaWYgKGRvY3VtZW50KCku aXNJbWFnZURvY3VtZW50KCkpCiAgICAgICAgICAgICBsaW5lQ29udGFpbmVyLT5zZXRJbmxpbmVT dHlsZVByb3BlcnR5KENTU1Byb3BlcnR5Q3Vyc29yLCBDU1NWYWx1ZVRleHQpOwogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1RleHRSZWNvZ25pdGlvblJlc3VsdC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKaW5kZXgg OGMwYzFlZTI0NzNiMTg0ZmZjYjJhZWI4ZWJjODdhMDE4NTc3M2MxNS4uY2ZjN2MxZjI0ODU3Nzg0 ZDNmODQ1MGJiMWFjOTI1NjA1NGRmYmRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vVGV4dFJlY29nbml0aW9uUmVzdWx0LmgKQEAgLTM4LDE0ICszOCwxNiBAQCBPQkpDX0NMQVNT IEREU2Nhbm5lclJlc3VsdDsKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFRleHRSZWNv Z25pdGlvbldvcmREYXRhIHsKLSAgICBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YShjb25zdCBTdHJp bmcmIHRoZVRleHQsIEZsb2F0UXVhZCYmIHF1YWQpCisgICAgVGV4dFJlY29nbml0aW9uV29yZERh dGEoY29uc3QgU3RyaW5nJiB0aGVUZXh0LCBGbG9hdFF1YWQmJiBxdWFkLCBib29sIGxlYWRpbmdX aGl0ZXNwYWNlKQogICAgICAgICA6IHRleHQodGhlVGV4dCkKICAgICAgICAgLCBub3JtYWxpemVk UXVhZChXVEZNb3ZlKHF1YWQpKQorICAgICAgICAsIGhhc0xlYWRpbmdXaGl0ZXNwYWNlKGxlYWRp bmdXaGl0ZXNwYWNlKQogICAgIHsKICAgICB9CiAKICAgICBTdHJpbmcgdGV4dDsKICAgICBGbG9h dFF1YWQgbm9ybWFsaXplZFF1YWQ7CisgICAgYm9vbCBoYXNMZWFkaW5nV2hpdGVzcGFjZSB7IHRy dWUgfTsKIAogICAgIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXIm KSBjb25zdDsKICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgc3RkOjpvcHRpb25h bDxUZXh0UmVjb2duaXRpb25Xb3JkRGF0YT4gZGVjb2RlKERlY29kZXImKTsKQEAgLTU1LDYgKzU3 LDcgQEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBUZXh0UmVjb2duaXRpb25Xb3JkRGF0 YTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGMKIHsKICAgICBlbmNvZGVyIDw8IHRleHQ7CiAg ICAgZW5jb2RlciA8PCBub3JtYWxpemVkUXVhZDsKKyAgICBlbmNvZGVyIDw8IGhhc0xlYWRpbmdX aGl0ZXNwYWNlOwogfQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9wdGlvbmFsPFRl eHRSZWNvZ25pdGlvbldvcmREYXRhPiBUZXh0UmVjb2duaXRpb25Xb3JkRGF0YTo6ZGVjb2RlKERl Y29kZXImIGRlY29kZXIpCkBAIC02OSw3ICs3MiwxMiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVy PiBzdGQ6Om9wdGlvbmFsPFRleHRSZWNvZ25pdGlvbldvcmREYXRhPiBUZXh0UmVjb2duaXRpb25X bwogICAgIGlmICghbm9ybWFsaXplZFF1YWQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7 CiAKLSAgICByZXR1cm4ge3sgV1RGTW92ZSgqdGV4dCksIFdURk1vdmUoKm5vcm1hbGl6ZWRRdWFk KSB9fTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IGhhc0xlYWRpbmdXaGl0ZXNwYWNlOworICAg IGRlY29kZXIgPj4gaGFzTGVhZGluZ1doaXRlc3BhY2U7CisgICAgaWYgKCFoYXNMZWFkaW5nV2hp dGVzcGFjZSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgIHJldHVybiB7eyBX VEZNb3ZlKCp0ZXh0KSwgV1RGTW92ZSgqbm9ybWFsaXplZFF1YWQpLCAqaGFzTGVhZGluZ1doaXRl c3BhY2UgfX07CiB9CiAKIHN0cnVjdCBUZXh0UmVjb2duaXRpb25MaW5lRGF0YSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNzczYWQwYmI5YTgzODA0MGMzN2E0NmI2NzRl NmNlY2ZlMWViNmJhYi4uZTU3ZDg1YTA1ZTEzMTBmOGQyNGM5Y2VkNGQ0NWI1OTdkODdjYzg5YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNTY3Niw3ICs1Njc2LDcgQEAg c3RhdGljIFRleHRSZWNvZ25pdGlvbkxpbmVEYXRhIG1ha2VEYXRhRm9yTGluZShjb25zdCBJbnRl cm5hbHM6OkltYWdlT3ZlcmxheUxpbmUKICAgICByZXR1cm4gewogICAgICAgICBnZXRRdWFkPElu dGVybmFsczo6SW1hZ2VPdmVybGF5TGluZT4obGluZSksCiAgICAgICAgIGxpbmUuY2hpbGRyZW4u bWFwKFtdKGF1dG8mIHRleHRDaGlsZCkgLT4gVGV4dFJlY29nbml0aW9uV29yZERhdGEgewotICAg ICAgICAgICAgcmV0dXJuIHsgdGV4dENoaWxkLnRleHQsIGdldFF1YWQ8SW50ZXJuYWxzOjpJbWFn ZU92ZXJsYXlUZXh0Pih0ZXh0Q2hpbGQpIH07CisgICAgICAgICAgICByZXR1cm4geyB0ZXh0Q2hp bGQudGV4dCwgZ2V0UXVhZDxJbnRlcm5hbHM6OkltYWdlT3ZlcmxheVRleHQ+KHRleHRDaGlsZCks IHRleHRDaGlsZC5oYXNMZWFkaW5nV2hpdGVzcGFjZSB9OwogICAgICAgICB9KQogICAgIH07CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oIGIvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBjMjE4YWJjZDIzMTk4MWIwNjEyOWM2 Y2E2ZTk4NmEwNzFlOWM5ZTdmLi45ODZmODFkNjY3NDI4YzlmZTUwNmE1YjJmYTA5MGFkNDNjNTBj ZmUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTg4Myw2ICs4ODMsNyBAQCBw dWJsaWM6CiAgICAgICAgIFJlZlB0cjxET01Qb2ludFJlYWRPbmx5PiB0b3BSaWdodDsKICAgICAg ICAgUmVmUHRyPERPTVBvaW50UmVhZE9ubHk+IGJvdHRvbVJpZ2h0OwogICAgICAgICBSZWZQdHI8 RE9NUG9pbnRSZWFkT25seT4gYm90dG9tTGVmdDsKKyAgICAgICAgYm9vbCBoYXNMZWFkaW5nV2hp dGVzcGFjZSB7IHRydWUgfTsKIAogICAgICAgICB+SW1hZ2VPdmVybGF5VGV4dCgpOwogICAgIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXggNDMxNzZhZTNhNzhhZDdiYWU3 MDlkNzcwMmI3OTMzYWQ4MjBhYWFlYS4uYzg5ZjNjZjZhZDFkODZkYjk3NWVkMGYxMjEyMTZmOWM3 YjdmZTkzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRs CisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtMjY2LDYgKzI2 Niw3IEBAIGVudW0gQXV0b3BsYXlQb2xpY3kgewogICAgIHJlcXVpcmVkIERPTVBvaW50UmVhZE9u bHkgdG9wUmlnaHQ7CiAgICAgcmVxdWlyZWQgRE9NUG9pbnRSZWFkT25seSBib3R0b21SaWdodDsK ICAgICByZXF1aXJlZCBET01Qb2ludFJlYWRPbmx5IGJvdHRvbUxlZnQ7CisgICAgYm9vbGVhbiBo YXNMZWFkaW5nV2hpdGVzcGFjZSA9IHRydWU7CiB9OwogCiBbCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL2NvY29hL1RleHRSZWNvZ25pdGlvblV0aWxpdGllcy5tbSBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCmluZGV4 IDFjM2NlNmU4NGU5NjEyZDA3ZWVhZGIwZjllOGU2M2JkZTVhNTZjYWIuLjc2MGJkZGY4MTQ3ODAz ZWYxZTRjODVmNDcyMTgzNmEyNWVhYTBlNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxh dGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvUGxhdGZvcm0vY29jb2EvVGV4dFJlY29nbml0aW9uVXRpbGl0aWVzLm1tCkBAIC00NywxMCAr NDcsNiBAQCBAaW50ZXJmYWNlIFZLSW1hZ2VBbmFseXNpcyAoU3RhZ2luZ183Nzk3ODc0NSkKIEBw cm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNBcnJheTxpZCA8VktXS0RhdGFEZXRlY3Rv ckluZm8+PiAqdGV4dERhdGFEZXRlY3RvcnM7CiBAZW5kCiAKLUBpbnRlcmZhY2UgVktXS1RleHRJ bmZvIChTdGFnaW5nXzc3MDg2MTA1KQotQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBO U0FycmF5PFZLV0tUZXh0SW5mbyAqPiAqY2hpbGRyZW47Ci1AZW5kCi0KIG5hbWVzcGFjZSBXZWJL aXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTczLDE2ICs2OSw0MSBAQCBUZXh0 UmVjb2duaXRpb25SZXN1bHQgbWFrZVRleHRSZWNvZ25pdGlvblJlc3VsdChWS0ltYWdlQW5hbHlz aXMgKmFuYWx5c2lzKQogICAgIE5TQXJyYXk8VktXS1RleHRJbmZvICo+ICphbGxMaW5lcyA9IGFu YWx5c2lzLmFsbExpbmVzOwogICAgIFRleHRSZWNvZ25pdGlvblJlc3VsdCByZXN1bHQ7CiAgICAg cmVzdWx0LmxpbmVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoYWxsTGluZXMuY291bnQpOwotICAg IGZvciAoVktXS1RleHRJbmZvICpsaW5lIGluIGFsbExpbmVzKSB7CisKKyAgICBib29sIGlzRmly c3RMaW5lID0gdHJ1ZTsKKyAgICBmb3IgKFZLV0tMaW5lSW5mbyAqbGluZSBpbiBhbGxMaW5lcykg ewogICAgICAgICBWZWN0b3I8VGV4dFJlY29nbml0aW9uV29yZERhdGE+IGNoaWxkcmVuOwotICAg ICAgICBpZiAoW2xpbmUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihjaGlsZHJlbildKSB7 Ci0gICAgICAgICAgICBOU0FycmF5PFZLV0tUZXh0SW5mbyAqPiAqdmtDaGlsZHJlbiA9IGxpbmUu Y2hpbGRyZW47Ci0gICAgICAgICAgICBjaGlsZHJlbi5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHZr Q2hpbGRyZW4uY291bnQpOwotICAgICAgICAgICAgZm9yIChWS1dLVGV4dEluZm8gKmNoaWxkIGlu IHZrQ2hpbGRyZW4pCi0gICAgICAgICAgICAgICAgY2hpbGRyZW4udW5jaGVja2VkQXBwZW5kKHsg Y2hpbGQuc3RyaW5nLCBmbG9hdFF1YWQoY2hpbGQucXVhZCkgfSk7Ci0gICAgICAgIH0gZWxzZQot ICAgICAgICAgICAgY2hpbGRyZW4uYXBwZW5kKHsgbGluZS5zdHJpbmcsIGZsb2F0UXVhZChsaW5l LnF1YWQpIH0pOworICAgICAgICBOU0FycmF5PFZLV0tUZXh0SW5mbyAqPiAqdmtDaGlsZHJlbiA9 IGxpbmUuY2hpbGRyZW47CisgICAgICAgIGNoaWxkcmVuLnJlc2VydmVJbml0aWFsQ2FwYWNpdHko dmtDaGlsZHJlbi5jb3VudCk7CisKKyAgICAgICAgU3RyaW5nIGxpbmVUZXh0ID0gbGluZS5zdHJp bmc7CisgICAgICAgIHVuc2lnbmVkIHNlYXJjaExvY2F0aW9uID0gMDsKKyAgICAgICAgZm9yIChW S1dLVGV4dEluZm8gKmNoaWxkIGluIHZrQ2hpbGRyZW4pIHsKKyAgICAgICAgICAgIGlmIChzZWFy Y2hMb2NhdGlvbiA+PSBsaW5lVGV4dC5sZW5ndGgoKSkgeworICAgICAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBTdHJpbmcgY2hpbGRUZXh0ID0gY2hpbGQuc3RyaW5nOworICAgICAg ICAgICAgYXV0byBtYXRjaExvY2F0aW9uID0gbGluZVRleHQuZmluZChjaGlsZFRleHQsIHNlYXJj aExvY2F0aW9uKTsKKyAgICAgICAgICAgIGlmIChtYXRjaExvY2F0aW9uID09IG5vdEZvdW5kKSB7 CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGJvb2wgaGFzTGVhZGluZ1do aXRlc3BhY2UgPSAoWyZdIHsKKyAgICAgICAgICAgICAgICBpZiAobWF0Y2hMb2NhdGlvbiA9PSBz ZWFyY2hMb2NhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuICFpc0ZpcnN0TGluZSAm JiAhc2VhcmNoTG9jYXRpb247CisKKyAgICAgICAgICAgICAgICBhdXRvIHRleHRCZWZvcmVNYXRj aCA9IGxpbmVUZXh0LnN1YnN0cmluZyhzZWFyY2hMb2NhdGlvbiwgbWF0Y2hMb2NhdGlvbiAtIHNl YXJjaExvY2F0aW9uKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gIXRleHRCZWZvcmVNYXRjaC5p c0VtcHR5KCkgJiYgaXNTcGFjZU9yTmV3bGluZSh0ZXh0QmVmb3JlTWF0Y2hbMF0pOworICAgICAg ICAgICAgfSkoKTsKKworICAgICAgICAgICAgc2VhcmNoTG9jYXRpb24gPSBtYXRjaExvY2F0aW9u ICsgY2hpbGRUZXh0Lmxlbmd0aCgpOworICAgICAgICAgICAgY2hpbGRyZW4udW5jaGVja2VkQXBw ZW5kKHsgV1RGTW92ZShjaGlsZFRleHQpLCBmbG9hdFF1YWQoY2hpbGQucXVhZCksIGhhc0xlYWRp bmdXaGl0ZXNwYWNlIH0pOworICAgICAgICB9CiAgICAgICAgIHJlc3VsdC5saW5lcy51bmNoZWNr ZWRBcHBlbmQoeyBmbG9hdFF1YWQobGluZS5xdWFkKSwgV1RGTW92ZShjaGlsZHJlbikgfSk7Cisg ICAgICAgIGlzRmlyc3RMaW5lID0gZmFsc2U7CiAgICAgfQogCiAjaWYgRU5BQkxFKERBVEFfREVU RUNUSU9OKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IGFiZWIxMTU2MTdhYWIxMjk2NWIzMjNmZjIwMzdiMTI3ZmNiM2JiMjYu LmIwYWVjOTZjNDMxODgwMGQ3MDI1NzRmNzkwYmRlYjY2NWI5NTEzNGQgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAyMS0wNy0wNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KKworICAgICAgICBbTGl2ZSBUZXh0XSBFeHRyYW5lb3VzIHNwYWNlcyB3aGVuIGNvcHlpbmcg b3IgdHJhbnNsYXRpbmcgQ2hpbmVzZSBhbmQgSmFwYW5lc2UgdGV4dCBpbiBXZWJLaXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzY3NAorICAgICAg ICByZGFyOi8vNzk2Njk4MDcKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisg ICAgICAgIEFkZCBhIGxheW91dCB0ZXN0IHRvIHZlcmlmeSB0aGF0IG5vIGV4dHJhbmVvdXMgc3Bh Y2VzIGFyZSBpbnNlcnRlZCB3aGVuIGluamVjdGluZyByZWNvZ25pemVkIHRleHQgaW50byBpbWFn ZXMKKyAgICAgICAgd2l0aG91dCBsZWFkaW5nIHdoaXRlc3BhY2UuCisKKyAgICAgICAgKiBmYXN0 L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92ZXJsYXktdGV4dC13aXRob3V0LWxlYWRp bmctd2hpdGVzcGFjZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaW1hZ2Vz L3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0 ZXNwYWNlLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA3LTA1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25f aHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIExpdmUgVGV4dCBzaG91bGQgbm90IGJlIHZpc2li bGUgaW4gdmlkZW8gdGh1bWJuYWlsIGltYWdlcyBiZWhpbmQgIlNraXAgQWQiIGJ1dHRvbiBvbiBZ b3VUdWJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0 aW9uL2ltYWdlLW92ZXJsYXktdGV4dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy90ZXh0LXJlY29nbml0aW9uL2ltYWdlLW92 ZXJsYXktdGV4dC13aXRob3V0LWxlYWRpbmctd2hpdGVzcGFjZS1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYjU2NWY1MjY4NDEwNjdiMzg3NWYxODZmMDcwNDBjYTg1MWMyNzRlMAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQtcmVjb2duaXRpb24vaW1hZ2Ut b3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0ZXNwYWNlLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDUgQEAKK1BBU1MgaW5wdXQudmFsdWUgaXMgImZvb2JhciBiYXoiCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9pbWFnZXMvdGV4dC1yZWNvZ25pdGlvbi9pbWFnZS1vdmVybGF5LXRleHQt d2l0aG91dC1sZWFkaW5nLXdoaXRlc3BhY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2Vz L3RleHQtcmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0 ZXNwYWNlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGNlZDA0Yjg5Mjc4MWZjZTBmMzgzMzQzYjU5MWFkNmJk NzQxMGI3NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL3RleHQt cmVjb2duaXRpb24vaW1hZ2Utb3ZlcmxheS10ZXh0LXdpdGhvdXQtbGVhZGluZy13aGl0ZXNwYWNl Lmh0bWwKQEAgLTAsMCArMSw2NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxz dHlsZT4KK2ltZyB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBs ZWZ0OiAwOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGltZyBzcmM9Ii4uL3Jlc291 cmNlcy9ncmVlbi00MDB4NDAwLnBuZyI+PC9pbWc+Cis8aW5wdXQ+PC9pbnB1dD4KKzxzY3JpcHQ+ CithZGRFdmVudExpc3RlbmVyKCJsb2FkIiwgKCkgPT4geworICAgIGNvbnN0IGltYWdlID0gZG9j dW1lbnQucXVlcnlTZWxlY3RvcigiaW1nIik7CisgICAgaW50ZXJuYWxzLmluc3RhbGxJbWFnZU92 ZXJsYXkoaW1hZ2UsIFsKKyAgICAgICAgeworICAgICAgICAgICAgdG9wTGVmdCA6IG5ldyBET01Q b2ludFJlYWRPbmx5KDAsIDApLAorICAgICAgICAgICAgdG9wUmlnaHQgOiBuZXcgRE9NUG9pbnRS ZWFkT25seSgxLCAwKSwKKyAgICAgICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVh ZE9ubHkoMSwgMC41KSwKKyAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9NUG9pbnRSZWFk T25seSgwLCAwLjUpLAorICAgICAgICAgICAgY2hpbGRyZW46IFsKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHRleHQgOiAiZm9vIiwKKyAgICAgICAgICAgICAgICAgICAg dG9wTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAsIDApLAorICAgICAgICAgICAgICAgICAg ICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuMywgMCksCisgICAgICAgICAgICAg ICAgICAgIGJvdHRvbVJpZ2h0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMC4zLCAwLjUpLAorICAg ICAgICAgICAgICAgICAgICBib3R0b21MZWZ0IDogbmV3IERPTVBvaW50UmVhZE9ubHkoMCwgMC41 KSwKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgdGV4dCA6ICJiYXIiLAorICAgICAgICAgICAgICAgICAgICB0b3BMZWZ0IDogbmV3IERP TVBvaW50UmVhZE9ubHkoMC4zLCAwKSwKKyAgICAgICAgICAgICAgICAgICAgdG9wUmlnaHQgOiBu ZXcgRE9NUG9pbnRSZWFkT25seSgwLjcsIDApLAorICAgICAgICAgICAgICAgICAgICBib3R0b21S aWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuNywgMC41KSwKKyAgICAgICAgICAgICAgICAg ICAgYm90dG9tTGVmdCA6IG5ldyBET01Qb2ludFJlYWRPbmx5KDAuMywgMC41KSwKKyAgICAgICAg ICAgICAgICAgICAgaGFzTGVhZGluZ1doaXRlc3BhY2U6IGZhbHNlLAorICAgICAgICAgICAgICAg IH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0ZXh0IDogImJheiIs CisgICAgICAgICAgICAgICAgICAgIHRvcExlZnQgOiBuZXcgRE9NUG9pbnRSZWFkT25seSgwLjcs IDApLAorICAgICAgICAgICAgICAgICAgICB0b3BSaWdodCA6IG5ldyBET01Qb2ludFJlYWRPbmx5 KDEsIDApLAorICAgICAgICAgICAgICAgICAgICBib3R0b21SaWdodCA6IG5ldyBET01Qb2ludFJl YWRPbmx5KDEsIDAuNSksCisgICAgICAgICAgICAgICAgICAgIGJvdHRvbUxlZnQgOiBuZXcgRE9N UG9pbnRSZWFkT25seSgwLjcsIDAuNSksCisgICAgICAgICAgICAgICAgICAgIGhhc0xlYWRpbmdX aGl0ZXNwYWNlOiB0cnVlLAorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIF0sCisgICAg ICAgIH0KKyAgICBdKTsKKworICAgIGdldFNlbGVjdGlvbigpLnNlbGVjdEFsbENoaWxkcmVuKGlu dGVybmFscy5zaGFkb3dSb290KGltYWdlKS5nZXRFbGVtZW50QnlJZCgiaW1hZ2Utb3ZlcmxheSIp KTsKKyAgICB0ZXN0UnVubmVyLmV4ZWNDb21tYW5kKCJDb3B5Iik7CisKKyAgICBpbnB1dCA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoImlucHV0Iik7CisgICAgaW5wdXQuZm9jdXMoKTsKKyAgICB0 ZXN0UnVubmVyLmV4ZWNDb21tYW5kKCJQYXN0ZSIpOworCisgICAgc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCJpbnB1dC52YWx1ZSIsICJmb29iYXIgYmF6Iik7Cit9KTsKKzwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK