218636 2020-11-05 15:22:42 -0800 [Cocoa] REGRESSION(r269211): Text with emoji can trigger drawing corruption 2020-11-05 17:45:48 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1705027 0 mmaxfield 2020-11-05 15:22:42 -0800 [Cocoa] Text with emoji can trigger drawing corruption 1705028 1 413356 mmaxfield 2020-11-05 15:27:45 -0800 Created attachment 413356 Patch 1705031 2 mmaxfield 2020-11-05 15:29:22 -0800 <rdar://problem/71066011> 1705058 3 413370 mmaxfield 2020-11-05 16:38:11 -0800 Created attachment 413370 Patch 1705086 4 ews-feeder 2020-11-05 17:45:46 -0800 Committed r269497: <https://trac.webkit.org/changeset/269497> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413370. 413356 2020-11-05 15:27:45 -0800 2020-11-05 17:04:03 -0800 Patch bug-218636-20201105152744.patch text/plain 9576 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjAyMjI2ZmRkNWFiZjlk NWEyYWUyN2RlNjgyZmIxYjIzMmQ3YzIzOS4uMzc2OTRhYTA1ODhhMTg2NTE3MTcyYTgyYWI1ZWFk Y2UxNGMxMDQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTExLTA1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBS RUdSRVNTSU9OKHIyNjkyMTEpOiBUZXh0IHdpdGggZW1vamkgY2FuIHRyaWdnZXIgZHJhd2luZyBj b3JydXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTg2MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBoYXZlIGFuIG9wdGltaXphdGlvbiBmb3IgZnJlcXVlbnRseS1wYWludGluZyBsYXllcnMg dGhhdCB3ZSB3aWxsIHR1cm4gdGV4dCBkcmF3aW5nCisgICAgICAgIGNvbW1hbmRzIGludG8gZGlz cGxheSBsaXN0cy4gcjI2OTIxMSBhZGRlZCBhIGJ1bmNoIG9mIGNvbnRleHQgc3RhdGUgaW50cm9z cGVjdGlvbiBhbmQKKyAgICAgICAgcmVjcmVhdGlvbiBjb2RlIHRvIG1ha2Ugc3VyZSB0aGF0IHRo ZSBzdGF0ZSBiZWluZyByZWNvcmRlZCBtYXRjaGVzIHRoZSBzdGF0ZSBkdXJpbmcKKyAgICAgICAg cGxheWJhY2suIEhvd2V2ZXIsIHRoYXQgY29kZSBpcyBpbmNvbXBhdGlibGUgd2l0aCB0aGlzIGNh Y2hlIGlkZWEsIHdoZXJlIHRoZSBzYW1lIERMCisgICAgICAgIG1pZ2h0IGJlIHBsYXllZCBiYWNr IGludG8gbXVsdGlwbGUgcGxhY2VzLgorCisgICAgICAgIFRoZSBzb2x1dGlvbiBpcyB0byBoYXZl IHR3byBraW5kcyBvZiB0ZXh0IGRpc3BsYXkgbGlzdCBkcmF3aW5nOgorICAgICAgICAxLiBEZWNv bnN0cnVjdCBkcmF3aW5nIGNvbW1hbmRzIGludG8gYSBzZXJpZXMgb2YgY29tbWFuZHMuIEUuZy4g ZW1vamkgd2lsbCBnZXQKKyAgICAgICAgZGVjb25zdHJ1Y3RlZCBpbnRvIERyYXdJbWFnZSBjb21t YW5kcy4gVGhpcyBraW5kIG9mIGRyYXdpbmcgbXVzdCBkbyBzdGF0ZSBpbnRyb3NwZWN0aW9uCisg ICAgICAgIHRvIG1ha2Ugc3VyZSB0aGUgZW1vamkgaXMgZHJhd24gaW4gdGhlIHJpZ2h0IHBsYWNl CisgICAgICAgIDIuIERvbid0IGRlY29uc3RydWN0IHRoZSBkcmF3aW5nIGNvbW1hbmRzOyBzaW1w bHkgZ2F0aGVyIHVwIHRoZSBEcmF3R2x5cGhzIGNvbW1hbmRzCisgICAgICAgIGFuZCByZWNvcmQg dGhlbSBkaXJlY3RseS4gVGhpcyBkb2Vzbid0IGRvIHN0YXRlIGludHJvc3BlY3Rpb24uCisKKyAg ICAgICAgR1BVIFByb2Nlc3MgZGlzcGxheSBsaXN0cyB1c2UgdGhlIGZpcnN0IGtpbmQsIHdoaWxl IHRoaXMgdGV4dCBjYWNoZSBvcHRpbWl6YXRpb24gdXNlcworICAgICAgICB0aGUgc2Vjb25kIGtp bmQuCisKKyAgICAgICAgVGVzdHMgZm9ydGhjb21pbmcuCisKKyAgICAgICAgKiBXZWJDb3JlLnhj b2RlcHJvai94Y3NoYXJlZGRhdGEveGNzY2hlbWVzL1dlYkNvcmUueGNzY2hlbWU6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udENhc2NhZGU6OmRpc3BsYXlMaXN0Rm9yVGV4dFJ1biBjb25zdCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVy Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0 RHJhd0dseXBoc1JlY29yZGVyQ29yZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eUxpc3Q6OkRyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKToKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzUmVjb3JkZXI6OmRyYXdHbHlwaHMpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29y ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpSZWNvcmRlcjo6UmVjb3Jk ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlz dFJlY29yZGVyLmg6CisKIDIwMjAtMTEtMDUgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXggZm9yIEFSTTY0RSBwYXJ0IDIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3hjc2hhcmVkZGF0 YS94Y3NjaGVtZXMvV2ViQ29yZS54Y3NjaGVtZSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3hjc2hhcmVkZGF0YS94Y3NjaGVtZXMvV2ViQ29yZS54Y3NjaGVtZQppbmRleCAxNTgy ZTFhM2M1NmRmOWU3ODIwMGQ5OWE5OTg2ODA1OTFiNGNkZjBiLi42MWM3Y2YwZWJjNTExNDBmN2M5 YmIxZDgwZDkzYzk0ZmQ2ZDM5MzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai94Y3NoYXJlZGRhdGEveGNzY2hlbWVzL1dlYkNvcmUueGNzY2hlbWUKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2oveGNzaGFyZWRkYXRhL3hjc2NoZW1lcy9X ZWJDb3JlLnhjc2NoZW1lCkBAIC00MCw2ICs0MCwxMCBAQAogICAgICAgZGVidWdEb2N1bWVudFZl cnNpb25pbmcgPSAiWUVTIgogICAgICAgZGVidWdTZXJ2aWNlRXh0ZW5zaW9uID0gImludGVybmFs IgogICAgICAgYWxsb3dMb2NhdGlvblNpbXVsYXRpb24gPSAiWUVTIj4KKyAgICAgIDxQYXRoUnVu bmFibGUKKyAgICAgICAgIHJ1bm5hYmxlRGVidWdnaW5nTW9kZSA9ICIwIgorICAgICAgICAgRmls ZVBhdGggPSAiL1VzZXJzL21tYXhmaWVsZC9CdWlsZC9Qcm9kdWN0cy9EZWJ1Zy9NaW5pQnJvd3Nl ci5hcHAiPgorICAgICAgPC9QYXRoUnVubmFibGU+CiAgICA8L0xhdW5jaEFjdGlvbj4KICAgIDxQ cm9maWxlQWN0aW9uCiAgICAgICBidWlsZENvbmZpZ3VyYXRpb24gPSAiUmVsZWFzZSIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAppbmRleCAy MGFjMzE3NzRhYzk1YzU4NTViYjk1MTAyODQ4YjAyNTg3NjU1ZGFiLi5jZDYyZWVlYWI3NjQwM2U3 ZjdlMzYzMjkyNmViNjJhMTUxMzRiZGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCkBAIC0zNDIsNyArMzQyLDcgQEAgc3RkOjp1bmlx dWVfcHRyPERpc3BsYXlMaXN0OjpEaXNwbGF5TGlzdD4gRm9udENhc2NhZGU6OmRpc3BsYXlMaXN0 Rm9yVGV4dFJ1bihHcmEKICAgICAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheUxpc3Q6OkRp c3BsYXlMaXN0PiBkaXNwbGF5TGlzdCA9IG1ha2VVbmlxdWU8RGlzcGxheUxpc3Q6OkRpc3BsYXlM aXN0PigpOwogICAgIEdyYXBoaWNzQ29udGV4dCByZWNvcmRpbmdDb250ZXh0KFsmXShHcmFwaGlj c0NvbnRleHQmIGRpc3BsYXlMaXN0Q29udGV4dCkgewotICAgICAgICByZXR1cm4gbWFrZVVuaXF1 ZTxEaXNwbGF5TGlzdDo6UmVjb3JkZXI+KGRpc3BsYXlMaXN0Q29udGV4dCwgKmRpc3BsYXlMaXN0 LCBjb250ZXh0LnN0YXRlKCksIEZsb2F0UmVjdCgpLCBBZmZpbmVUcmFuc2Zvcm0oKSk7CisgICAg ICAgIHJldHVybiBtYWtlVW5pcXVlPERpc3BsYXlMaXN0OjpSZWNvcmRlcj4oZGlzcGxheUxpc3RD b250ZXh0LCAqZGlzcGxheUxpc3QsIGNvbnRleHQuc3RhdGUoKSwgRmxvYXRSZWN0KCksIEFmZmlu ZVRyYW5zZm9ybSgpLCBudWxscHRyLCBEaXNwbGF5TGlzdDo6RHJhd0dseXBoc1JlY29yZGVyOjpE cmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb246OkRvbnREZWNvbnN0cnVjdCk7CiAgICAgfSk7CiAgICAg CiAgICAgRmxvYXRQb2ludCBzdGFydFBvaW50ID0gdG9GbG9hdFBvaW50KFdlYkNvcmU6OnNpemUo Z2x5cGhCdWZmZXIuaW5pdGlhbEFkdmFuY2UoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1Jl Y29yZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMv RGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXIuaAppbmRleCA0ZjhlNTQ3OTk1Zjk5MzczNDIw MmRhMTI2YWIwZjE3MTMyOWNjZTNiLi4yYzdmMmFkZjVhODk0ZmJkMDg1MTNiODhmZWJiZThhNzA4 N2Y2OWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhz UmVjb3JkZXIuaApAQCAtNTAsNyArNTAsMTEgQEAgY2xhc3MgUmVjb3JkZXI7CiAKIGNsYXNzIERy YXdHbHlwaHNSZWNvcmRlciB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgRHJhd0dseXBoc1JlY29y ZGVyKFJlY29yZGVyJik7CisgICAgZW51bSBjbGFzcyBEcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb24g eworICAgICAgICBEZWNvbnN0cnVjdCwKKyAgICAgICAgRG9udERlY29uc3RydWN0CisgICAgfTsK KyAgICBleHBsaWNpdCBEcmF3R2x5cGhzUmVjb3JkZXIoUmVjb3JkZXImLCBEcmF3R2x5cGhzRGVj b25zdHJ1Y3Rpb24pOwogCiAgICAgdm9pZCBkcmF3R2x5cGhzKGNvbnN0IEZvbnQmLCBjb25zdCBH bHlwaEJ1ZmZlciYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxv YXRQb2ludCYgYW5jaG9yUG9pbnQsIEZvbnRTbW9vdGhpbmdNb2RlKTsKIApAQCAtODQsNiArODgs NyBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBSZWNvcmRlciYgbV9vd25lcjsKKyAgICBEcmF3 R2x5cGhzRGVjb25zdHJ1Y3Rpb24gbV9kcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb247CiAgICAgR3Jh cGhpY3NDb250ZXh0IG1faW50ZXJuYWxDb250ZXh0OwogICAgIGNvbnN0IEZvbnQqIG1fb3JpZ2lu YWxGb250IHsgbnVsbHB0ciB9OwogICAgIEZvbnRTbW9vdGhpbmdNb2RlIG1fc21vb3RoaW5nTW9k ZSB7IEZvbnRTbW9vdGhpbmdNb2RlOjpBdXRvU21vb3RoaW5nIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3 R2x5cGhzUmVjb3JkZXJDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXJDb3JlVGV4dC5j cHAKaW5kZXggZjdjYTZiYmZmZDk4ZmEwZGY2OGE4MTM0OGNhZWQ1ODYzYWE3ZDUwMy4uZDVmZWM4 N2ZlMGZlMDE2MWIzMzM1NmI1NjNmZWI1ZDc4YWNkZDVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBo c1JlY29yZGVyQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdERyYXdHbHlwaHNSZWNvcmRlckNvcmVUZXh0LmNw cApAQCAtODcsOCArODcsOSBAQCBHcmFwaGljc0NvbnRleHQgRHJhd0dseXBoc1JlY29yZGVyOjpj cmVhdGVJbnRlcm5hbENvbnRleHQoKQogICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQoY29udGV4 dC5nZXQoKSk7CiB9CiAKLURyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJl Y29yZGVyJiBvd25lcikKK0RyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJl Y29yZGVyJiBvd25lciwgRHJhd0dseXBoc0RlY29uc3RydWN0aW9uIGRyYXdHbHlwaHNEZWNvbnN0 cnVjdGlvbikKICAgICA6IG1fb3duZXIob3duZXIpCisgICAgLCBtX2RyYXdHbHlwaHNEZWNvbnN0 cnVjdGlvbihkcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb24pCiAgICAgLCBtX2ludGVybmFsQ29udGV4 dChjcmVhdGVJbnRlcm5hbENvbnRleHQoKSkKIHsKIH0KQEAgLTM2MSw2ICszNjIsMTIgQEAgdm9p ZCBEcmF3R2x5cGhzUmVjb3JkZXI6OnJlY29yZERyYXdJbWFnZShDR1JlbmRlcmluZ1N0YXRlUmVm LCBDR0dTdGF0ZVJlZiBnc3RhdGUKIAogdm9pZCBEcmF3R2x5cGhzUmVjb3JkZXI6OmRyYXdHbHlw aHMoY29uc3QgRm9udCYgZm9udCwgY29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCB1bnNp Z25lZCBmcm9tLCB1bnNpZ25lZCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmIHN0YXJ0UG9p bnQsIEZvbnRTbW9vdGhpbmdNb2RlIHNtb290aGluZ01vZGUpCiB7CisgICAgaWYgKG1fZHJhd0ds eXBoc0RlY29uc3RydWN0aW9uID09IERyYXdHbHlwaHNEZWNvbnN0cnVjdGlvbjo6RG9udERlY29u c3RydWN0KSB7CisgICAgICAgIG1fb3duZXIuYXBwZW5kSXRlbUFuZFVwZGF0ZUV4dGVudChEcmF3 R2x5cGhzOjpjcmVhdGUoZm9udCwgZ2x5cGhCdWZmZXIuZ2x5cGhzKGZyb20pLCBnbHlwaEJ1ZmZl ci5hZHZhbmNlcyhmcm9tKSwgbnVtR2x5cGhzLCBzdGFydFBvaW50LCBzbW9vdGhpbmdNb2RlKSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBBU1NFUlQobV9kcmF3R2x5cGhzRGVjb25z dHJ1Y3Rpb24gPT0gRHJhd0dseXBoc0RlY29uc3RydWN0aW9uOjpEZWNvbnN0cnVjdCk7CiAgICAg cHJlcGFyZUludGVybmFsQ29udGV4dChmb250LCBzbW9vdGhpbmdNb2RlKTsKICAgICBGb250Q2Fz Y2FkZTo6ZHJhd0dseXBocyhtX2ludGVybmFsQ29udGV4dCwgZm9udCwgZ2x5cGhCdWZmZXIsIGZy b20sIG51bUdseXBocywgc3RhcnRQb2ludCwgc21vb3RoaW5nTW9kZSk7CiAgICAgY29uY2x1ZGVJ bnRlcm5hbENvbnRleHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNw cAppbmRleCBiZjViODNiMjJjM2Y0YzcyNTgxZTY4YjlhNTJkNzczMDJkMjgyOTRlLi5kNTMyMjM5 ZGQxZjk5ZmNiMDZkOTcyY2FkYzExNjkzMmNjMTU1NDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rp c3BsYXlMaXN0UmVjb3JkZXIuY3BwCkBAIC0zOCwxMSArMzgsMTEgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBEaXNwbGF5TGlzdCB7CiAKLVJlY29yZGVyOjpSZWNvcmRlcihHcmFw aGljc0NvbnRleHQmIGNvbnRleHQsIERpc3BsYXlMaXN0JiBkaXNwbGF5TGlzdCwgY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlLCBjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBj b25zdCBBZmZpbmVUcmFuc2Zvcm0mIGluaXRpYWxDVE0sIERlbGVnYXRlKiBkZWxlZ2F0ZSkKK1Jl Y29yZGVyOjpSZWNvcmRlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIERpc3BsYXlMaXN0JiBk aXNwbGF5TGlzdCwgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlLCBjb25zdCBGbG9h dFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIGluaXRpYWxDVE0sIERl bGVnYXRlKiBkZWxlZ2F0ZSwgRHJhd0dseXBoc1JlY29yZGVyOjpEcmF3R2x5cGhzRGVjb25zdHJ1 Y3Rpb24gZHJhd0dseXBoc0RlY29uc3RydWN0aW9uKQogICAgIDogR3JhcGhpY3NDb250ZXh0SW1w bChjb250ZXh0LCBpbml0aWFsQ2xpcCwgQWZmaW5lVHJhbnNmb3JtKCkpCiAgICAgLCBtX2Rpc3Bs YXlMaXN0KGRpc3BsYXlMaXN0KQogICAgICwgbV9kZWxlZ2F0ZShkZWxlZ2F0ZSkKLSAgICAsIG1f ZHJhd0dseXBoc1JlY29yZGVyKCp0aGlzKQorICAgICwgbV9kcmF3R2x5cGhzUmVjb3JkZXIoKnRo aXMsIGRyYXdHbHlwaHNEZWNvbnN0cnVjdGlvbikKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oRGlz cGxheUxpc3RzLCBzdHJlYW0gPDwgIlxuUmVjb3JkaW5nIHdpdGggY2xpcCAiIDw8IGluaXRpYWxD bGlwKTsKICAgICBtX3N0YXRlU3RhY2suYXBwZW5kKHsgc3RhdGUsIGluaXRpYWxDVE0sIGluaXRp YWxDbGlwIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgKaW5kZXggOTJj MDUxM2E3ZjljNmJjYTUyNTA0NDhmMzA4M2ZkZTFjZDY2ZDg5NC4uOTZjM2E3ZjQzNTEwZTE3ZDk3 NTJkYzcwNzA0MDU5NWMzNjUyODY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNv cmRlci5oCkBAIC01NSw3ICs1NSw3IEBAIGNsYXNzIFJlY29yZGVyIDogcHVibGljIEdyYXBoaWNz Q29udGV4dEltcGwgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlY29yZGVyKTsKIHB1Ymxp YzoKICAgICBjbGFzcyBEZWxlZ2F0ZTsKLSAgICBXRUJDT1JFX0VYUE9SVCBSZWNvcmRlcihHcmFw aGljc0NvbnRleHQmLCBEaXNwbGF5TGlzdCYsIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiwg Y29uc3QgRmxvYXRSZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiwgRGVs ZWdhdGUqID0gbnVsbHB0cik7CisgICAgV0VCQ09SRV9FWFBPUlQgUmVjb3JkZXIoR3JhcGhpY3ND b250ZXh0JiwgRGlzcGxheUxpc3QmLCBjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYsIGNvbnN0 IEZsb2F0UmVjdCYgaW5pdGlhbENsaXAsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYsIERlbGVnYXRl KiA9IG51bGxwdHIsIERyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc0RlY29uc3RydWN0aW9u ID0gRHJhd0dseXBoc1JlY29yZGVyOjpEcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb246OkRlY29uc3Ry dWN0KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIH5SZWNvcmRlcigpOwogCiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBwdXRJbWFnZURhdGEoQWxwaGFQcmVtdWx0aXBsaWNhdGlvbiBpbnB1 dEZvcm1hdCwgY29uc3QgSW1hZ2VEYXRhJiwgY29uc3QgSW50UmVjdCYgc3JjUmVjdCwgY29uc3Qg SW50UG9pbnQmIGRlc3RQb2ludCwgQWxwaGFQcmVtdWx0aXBsaWNhdGlvbiBkZXN0Rm9ybWF0KTsK 413370 2020-11-05 16:38:11 -0800 2020-11-05 17:45:47 -0800 Patch bug-218636-20201105163810.patch text/plain 12762 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjAyMjI2ZmRkNWFiZjlk NWEyYWUyN2RlNjgyZmIxYjIzMmQ3YzIzOS4uZTg0Y2QzZmVjNDRkYTBkOGYxZTI0YmY2MjUwNzQ4 M2ZiYWNlYTA2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIwLTExLTA1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBS RUdSRVNTSU9OKHIyNjkyMTEpOiBUZXh0IHdpdGggZW1vamkgY2FuIHRyaWdnZXIgZHJhd2luZyBj b3JydXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTg2MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxMDY2MDExPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgYW4gb3B0aW1pemF0 aW9uIGZvciBmcmVxdWVudGx5LXBhaW50aW5nIGxheWVycyB0aGF0IHdlIHdpbGwgdHVybiB0ZXh0 IGRyYXdpbmcKKyAgICAgICAgY29tbWFuZHMgaW50byBkaXNwbGF5IGxpc3RzLiByMjY5MjExIGFk ZGVkIGEgYnVuY2ggb2YgY29udGV4dCBzdGF0ZSBpbnRyb3NwZWN0aW9uIGFuZAorICAgICAgICBy ZWNyZWF0aW9uIGNvZGUgdG8gbWFrZSBzdXJlIHRoYXQgdGhlIHN0YXRlIGJlaW5nIHJlY29yZGVk IG1hdGNoZXMgdGhlIHN0YXRlIGR1cmluZworICAgICAgICBwbGF5YmFjay4gSG93ZXZlciwgdGhh dCBjb2RlIGlzIGluY29tcGF0aWJsZSB3aXRoIHRoaXMgY2FjaGUgaWRlYSwgd2hlcmUgdGhlIHNh bWUgREwKKyAgICAgICAgbWlnaHQgYmUgcGxheWVkIGJhY2sgaW50byBtdWx0aXBsZSBwbGFjZXMu CisKKyAgICAgICAgVGhlIHNvbHV0aW9uIGlzIHRvIGhhdmUgdHdvIGtpbmRzIG9mIHRleHQgZGlz cGxheSBsaXN0IGRyYXdpbmc6CisgICAgICAgIDEuIERlY29uc3RydWN0IGRyYXdpbmcgY29tbWFu ZHMgaW50byBhIHNlcmllcyBvZiBjb21tYW5kcy4gRS5nLiBlbW9qaSB3aWxsIGdldAorICAgICAg ICBkZWNvbnN0cnVjdGVkIGludG8gRHJhd0ltYWdlIGNvbW1hbmRzLiBUaGlzIGtpbmQgb2YgZHJh d2luZyBtdXN0IGRvIHN0YXRlIGludHJvc3BlY3Rpb24KKyAgICAgICAgdG8gbWFrZSBzdXJlIHRo ZSBlbW9qaSBpcyBkcmF3biBpbiB0aGUgcmlnaHQgcGxhY2UKKyAgICAgICAgMi4gRG9uJ3QgZGVj b25zdHJ1Y3QgdGhlIGRyYXdpbmcgY29tbWFuZHM7IHNpbXBseSBnYXRoZXIgdXAgdGhlIERyYXdH bHlwaHMgY29tbWFuZHMKKyAgICAgICAgYW5kIHJlY29yZCB0aGVtIGRpcmVjdGx5LiBUaGlzIGRv ZXNuJ3QgZG8gc3RhdGUgaW50cm9zcGVjdGlvbi4KKworICAgICAgICBHUFUgUHJvY2VzcyBkaXNw bGF5IGxpc3RzIHVzZSB0aGUgZmlyc3Qga2luZCwgd2hpbGUgdGhpcyB0ZXh0IGNhY2hlIG9wdGlt aXphdGlvbiB1c2VzCisgICAgICAgIHRoZSBzZWNvbmQga2luZC4KKworICAgICAgICBUZXN0OiBm YXN0L3RleHQvZnJlcXVlbnQtdGV4dC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9Gb250Q2FzY2FkZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FzY2FkZTo6ZGlzcGxh eUxpc3RGb3JUZXh0UnVuIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXIuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXJD b3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoc1Jl Y29yZGVyOjpEcmF3R2x5cGhzUmVjb3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxp c3Q6OkRyYXdHbHlwaHNSZWNvcmRlcjo6ZHJhd0dseXBocyk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVySGFyZkJ1 enouY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHNSZWNvcmRl cjo6RHJhd0dseXBoc1JlY29yZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXJXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29y ZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxp c3RSZWNvcmRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVjb3JkZXI6 OlJlY29yZGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlz cGxheUxpc3RSZWNvcmRlci5oOgorCiAyMDIwLTExLTA1ICBZdXN1a2UgU3V6dWtpICA8eXN1enVr aUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBBUk02NEUg cGFydCAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk ZS5jcHAKaW5kZXggMjBhYzMxNzc0YWM5NWM1ODU1YmI5NTEwMjg0OGIwMjU4NzY1NWRhYi4uY2Q2 MmVlZWFiNzY0MDNlN2Y3ZTM2MzI5MjZlYjYyYTE1MTM0YmRiZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtMzQyLDcgKzM0Miw3 IEBAIHN0ZDo6dW5pcXVlX3B0cjxEaXNwbGF5TGlzdDo6RGlzcGxheUxpc3Q+IEZvbnRDYXNjYWRl OjpkaXNwbGF5TGlzdEZvclRleHRSdW4oR3JhCiAgICAgCiAgICAgc3RkOjp1bmlxdWVfcHRyPERp c3BsYXlMaXN0OjpEaXNwbGF5TGlzdD4gZGlzcGxheUxpc3QgPSBtYWtlVW5pcXVlPERpc3BsYXlM aXN0OjpEaXNwbGF5TGlzdD4oKTsKICAgICBHcmFwaGljc0NvbnRleHQgcmVjb3JkaW5nQ29udGV4 dChbJl0oR3JhcGhpY3NDb250ZXh0JiBkaXNwbGF5TGlzdENvbnRleHQpIHsKLSAgICAgICAgcmV0 dXJuIG1ha2VVbmlxdWU8RGlzcGxheUxpc3Q6OlJlY29yZGVyPihkaXNwbGF5TGlzdENvbnRleHQs ICpkaXNwbGF5TGlzdCwgY29udGV4dC5zdGF0ZSgpLCBGbG9hdFJlY3QoKSwgQWZmaW5lVHJhbnNm b3JtKCkpOworICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxEaXNwbGF5TGlzdDo6UmVjb3JkZXI+ KGRpc3BsYXlMaXN0Q29udGV4dCwgKmRpc3BsYXlMaXN0LCBjb250ZXh0LnN0YXRlKCksIEZsb2F0 UmVjdCgpLCBBZmZpbmVUcmFuc2Zvcm0oKSwgbnVsbHB0ciwgRGlzcGxheUxpc3Q6OkRyYXdHbHlw aHNSZWNvcmRlcjo6RHJhd0dseXBoc0RlY29uc3RydWN0aW9uOjpEb250RGVjb25zdHJ1Y3QpOwog ICAgIH0pOwogICAgIAogICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHRvRmxvYXRQb2ludChX ZWJDb3JlOjpzaXplKGdseXBoQnVmZmVyLmluaXRpYWxBZHZhbmNlKCkpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlz dERyYXdHbHlwaHNSZWNvcmRlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVyLmgKaW5kZXggNGY4ZTU0 Nzk5NWY5OTM3MzQyMDJkYTEyNmFiMGYxNzEzMjljY2UzYi4uMmM3ZjJhZGY1YTg5NGZiZDA4NTEz Yjg4ZmViYmU4YTcwODdmNjllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlM aXN0RHJhd0dseXBoc1JlY29yZGVyLmgKQEAgLTUwLDcgKzUwLDExIEBAIGNsYXNzIFJlY29yZGVy OwogCiBjbGFzcyBEcmF3R2x5cGhzUmVjb3JkZXIgewogcHVibGljOgotICAgIGV4cGxpY2l0IERy YXdHbHlwaHNSZWNvcmRlcihSZWNvcmRlciYpOworICAgIGVudW0gY2xhc3MgRHJhd0dseXBoc0Rl Y29uc3RydWN0aW9uIHsKKyAgICAgICAgRGVjb25zdHJ1Y3QsCisgICAgICAgIERvbnREZWNvbnN0 cnVjdAorICAgIH07CisgICAgZXhwbGljaXQgRHJhd0dseXBoc1JlY29yZGVyKFJlY29yZGVyJiwg RHJhd0dseXBoc0RlY29uc3RydWN0aW9uKTsKIAogICAgIHZvaWQgZHJhd0dseXBocyhjb25zdCBG b250JiwgY29uc3QgR2x5cGhCdWZmZXImLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCBudW1HbHlw aHMsIGNvbnN0IEZsb2F0UG9pbnQmIGFuY2hvclBvaW50LCBGb250U21vb3RoaW5nTW9kZSk7CiAK QEAgLTg0LDYgKzg4LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgUmVjb3JkZXImIG1fb3du ZXI7CisgICAgRHJhd0dseXBoc0RlY29uc3RydWN0aW9uIG1fZHJhd0dseXBoc0RlY29uc3RydWN0 aW9uOwogICAgIEdyYXBoaWNzQ29udGV4dCBtX2ludGVybmFsQ29udGV4dDsKICAgICBjb25zdCBG b250KiBtX29yaWdpbmFsRm9udCB7IG51bGxwdHIgfTsKICAgICBGb250U21vb3RoaW5nTW9kZSBt X3Ntb290aGluZ01vZGUgeyBGb250U21vb3RoaW5nTW9kZTo6QXV0b1Ntb290aGluZyB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rp c3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVyQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29y ZGVyQ29yZVRleHQuY3BwCmluZGV4IGY3Y2E2YmJmZmQ5OGZhMGRmNjhhODEzNDhjYWVkNTg2M2Fh N2Q1MDMuLmQ1ZmVjODdmZTBmZTAxNjFiMzMzNTZiNTYzZmViNWQ3OGFjZGQ1YWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5 TGlzdERyYXdHbHlwaHNSZWNvcmRlckNvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3Jk ZXJDb3JlVGV4dC5jcHAKQEAgLTg3LDggKzg3LDkgQEAgR3JhcGhpY3NDb250ZXh0IERyYXdHbHlw aHNSZWNvcmRlcjo6Y3JlYXRlSW50ZXJuYWxDb250ZXh0KCkKICAgICByZXR1cm4gR3JhcGhpY3ND b250ZXh0KGNvbnRleHQuZ2V0KCkpOwogfQogCi1EcmF3R2x5cGhzUmVjb3JkZXI6OkRyYXdHbHlw aHNSZWNvcmRlcihSZWNvcmRlciYgb3duZXIpCitEcmF3R2x5cGhzUmVjb3JkZXI6OkRyYXdHbHlw aHNSZWNvcmRlcihSZWNvcmRlciYgb3duZXIsIERyYXdHbHlwaHNEZWNvbnN0cnVjdGlvbiBkcmF3 R2x5cGhzRGVjb25zdHJ1Y3Rpb24pCiAgICAgOiBtX293bmVyKG93bmVyKQorICAgICwgbV9kcmF3 R2x5cGhzRGVjb25zdHJ1Y3Rpb24oZHJhd0dseXBoc0RlY29uc3RydWN0aW9uKQogICAgICwgbV9p bnRlcm5hbENvbnRleHQoY3JlYXRlSW50ZXJuYWxDb250ZXh0KCkpCiB7CiB9CkBAIC0zNjEsNiAr MzYyLDEyIEBAIHZvaWQgRHJhd0dseXBoc1JlY29yZGVyOjpyZWNvcmREcmF3SW1hZ2UoQ0dSZW5k ZXJpbmdTdGF0ZVJlZiwgQ0dHU3RhdGVSZWYgZ3N0YXRlCiAKIHZvaWQgRHJhd0dseXBoc1JlY29y ZGVyOjpkcmF3R2x5cGhzKGNvbnN0IEZvbnQmIGZvbnQsIGNvbnN0IEdseXBoQnVmZmVyJiBnbHlw aEJ1ZmZlciwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBv aW50JiBzdGFydFBvaW50LCBGb250U21vb3RoaW5nTW9kZSBzbW9vdGhpbmdNb2RlKQogeworICAg IGlmIChtX2RyYXdHbHlwaHNEZWNvbnN0cnVjdGlvbiA9PSBEcmF3R2x5cGhzRGVjb25zdHJ1Y3Rp b246OkRvbnREZWNvbnN0cnVjdCkgeworICAgICAgICBtX293bmVyLmFwcGVuZEl0ZW1BbmRVcGRh dGVFeHRlbnQoRHJhd0dseXBoczo6Y3JlYXRlKGZvbnQsIGdseXBoQnVmZmVyLmdseXBocyhmcm9t KSwgZ2x5cGhCdWZmZXIuYWR2YW5jZXMoZnJvbSksIG51bUdseXBocywgc3RhcnRQb2ludCwgc21v b3RoaW5nTW9kZSkpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgQVNTRVJUKG1fZHJh d0dseXBoc0RlY29uc3RydWN0aW9uID09IERyYXdHbHlwaHNEZWNvbnN0cnVjdGlvbjo6RGVjb25z dHJ1Y3QpOwogICAgIHByZXBhcmVJbnRlcm5hbENvbnRleHQoZm9udCwgc21vb3RoaW5nTW9kZSk7 CiAgICAgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMobV9pbnRlcm5hbENvbnRleHQsIGZvbnQsIGds eXBoQnVmZmVyLCBmcm9tLCBudW1HbHlwaHMsIHN0YXJ0UG9pbnQsIHNtb290aGluZ01vZGUpOwog ICAgIGNvbmNsdWRlSW50ZXJuYWxDb250ZXh0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVj b3JkZXJIYXJmQnV6ei5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3JkZXJIYXJmQnV6ei5jcHAKaW5kZXgg MjNhYzMyNGI3YjAwYTllMTZhNTZhZDY3MGNlMDRjZmE3N2ZjOWZhOC4uMGJiODc0NDMyYjRlNjhm YmI0NGE4NzI0OTI5YWEwZTdlZjlmYjViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVy SGFyZkJ1enouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdERyYXdHbHlwaHNSZWNvcmRlckhhcmZCdXp6LmNwcApAQCAtMzYs NyArMzYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBEaXNwbGF5TGlzdCB7 CiAKLURyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJlY29yZGVyJiBvd25l cikKK0RyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJlY29yZGVyJiBvd25l ciwgRHJhd0dseXBoc0RlY29uc3RydWN0aW9uKQogICAgIDogbV9vd25lcihvd25lcikKIHsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0 cy9EaXNwbGF5TGlzdERyYXdHbHlwaHNSZWNvcmRlcldpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3REcmF3R2x5cGhzUmVjb3Jk ZXJXaW4uY3BwCmluZGV4IDIzYWMzMjRiN2IwMGE5ZTE2YTU2YWQ2NzBjZTA0Y2ZhNzdmYzlmYTgu LjBiYjg3NDQzMmI0ZTY4ZmJiNDRhODcyNDkyOWFhMGU3ZWY5ZmI1YmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdERy YXdHbHlwaHNSZWNvcmRlcldpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0RHJhd0dseXBoc1JlY29yZGVyV2luLmNwcApA QCAtMzYsNyArMzYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBEaXNwbGF5 TGlzdCB7CiAKLURyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJlY29yZGVy JiBvd25lcikKK0RyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc1JlY29yZGVyKFJlY29yZGVy JiBvd25lciwgRHJhd0dseXBoc0RlY29uc3RydWN0aW9uKQogICAgIDogbV9vd25lcihvd25lcikK IHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcAppbmRleCBiZjVi ODNiMjJjM2Y0YzcyNTgxZTY4YjlhNTJkNzczMDJkMjgyOTRlLi5kNTMyMjM5ZGQxZjk5ZmNiMDZk OTcyY2FkYzExNjkzMmNjMTU1NDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVj b3JkZXIuY3BwCkBAIC0zOCwxMSArMzgsMTEgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVz cGFjZSBEaXNwbGF5TGlzdCB7CiAKLVJlY29yZGVyOjpSZWNvcmRlcihHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIERpc3BsYXlMaXN0JiBkaXNwbGF5TGlzdCwgY29uc3QgR3JhcGhpY3NDb250ZXh0 U3RhdGUmIHN0YXRlLCBjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZpbmVU cmFuc2Zvcm0mIGluaXRpYWxDVE0sIERlbGVnYXRlKiBkZWxlZ2F0ZSkKK1JlY29yZGVyOjpSZWNv cmRlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIERpc3BsYXlMaXN0JiBkaXNwbGF5TGlzdCwg Y29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlLCBjb25zdCBGbG9hdFJlY3QmIGluaXRp YWxDbGlwLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIGluaXRpYWxDVE0sIERlbGVnYXRlKiBkZWxl Z2F0ZSwgRHJhd0dseXBoc1JlY29yZGVyOjpEcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb24gZHJhd0ds eXBoc0RlY29uc3RydWN0aW9uKQogICAgIDogR3JhcGhpY3NDb250ZXh0SW1wbChjb250ZXh0LCBp bml0aWFsQ2xpcCwgQWZmaW5lVHJhbnNmb3JtKCkpCiAgICAgLCBtX2Rpc3BsYXlMaXN0KGRpc3Bs YXlMaXN0KQogICAgICwgbV9kZWxlZ2F0ZShkZWxlZ2F0ZSkKLSAgICAsIG1fZHJhd0dseXBoc1Jl Y29yZGVyKCp0aGlzKQorICAgICwgbV9kcmF3R2x5cGhzUmVjb3JkZXIoKnRoaXMsIGRyYXdHbHlw aHNEZWNvbnN0cnVjdGlvbikKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oRGlzcGxheUxpc3RzLCBz dHJlYW0gPDwgIlxuUmVjb3JkaW5nIHdpdGggY2xpcCAiIDw8IGluaXRpYWxDbGlwKTsKICAgICBt X3N0YXRlU3RhY2suYXBwZW5kKHsgc3RhdGUsIGluaXRpYWxDVE0sIGluaXRpYWxDbGlwIH0pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3Rz L0Rpc3BsYXlMaXN0UmVjb3JkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgKaW5kZXggOTJjMDUxM2E3ZjljNmJj YTUyNTA0NDhmMzA4M2ZkZTFjZDY2ZDg5NC4uOTZjM2E3ZjQzNTEwZTE3ZDk3NTJkYzcwNzA0MDU5 NWMzNjUyODY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5oCkBAIC01 NSw3ICs1NSw3IEBAIGNsYXNzIFJlY29yZGVyIDogcHVibGljIEdyYXBoaWNzQ29udGV4dEltcGwg ewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlY29yZGVyKTsKIHB1YmxpYzoKICAgICBjbGFz cyBEZWxlZ2F0ZTsKLSAgICBXRUJDT1JFX0VYUE9SVCBSZWNvcmRlcihHcmFwaGljc0NvbnRleHQm LCBEaXNwbGF5TGlzdCYsIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiwgY29uc3QgRmxvYXRS ZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiwgRGVsZWdhdGUqID0gbnVs bHB0cik7CisgICAgV0VCQ09SRV9FWFBPUlQgUmVjb3JkZXIoR3JhcGhpY3NDb250ZXh0JiwgRGlz cGxheUxpc3QmLCBjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYsIGNvbnN0IEZsb2F0UmVjdCYg aW5pdGlhbENsaXAsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYsIERlbGVnYXRlKiA9IG51bGxwdHIs IERyYXdHbHlwaHNSZWNvcmRlcjo6RHJhd0dseXBoc0RlY29uc3RydWN0aW9uID0gRHJhd0dseXBo c1JlY29yZGVyOjpEcmF3R2x5cGhzRGVjb25zdHJ1Y3Rpb246OkRlY29uc3RydWN0KTsKICAgICBX RUJDT1JFX0VYUE9SVCB2aXJ0dWFsIH5SZWNvcmRlcigpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCBwdXRJbWFnZURhdGEoQWxwaGFQcmVtdWx0aXBsaWNhdGlvbiBpbnB1dEZvcm1hdCwgY29u c3QgSW1hZ2VEYXRhJiwgY29uc3QgSW50UmVjdCYgc3JjUmVjdCwgY29uc3QgSW50UG9pbnQmIGRl c3RQb2ludCwgQWxwaGFQcmVtdWx0aXBsaWNhdGlvbiBkZXN0Rm9ybWF0KTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwMzlk MGZhODlkN2IwMTBjM2M4NGFhMGE2NDExMjIxYzUyY2QyNjkwLi4xNWVkOWJhZGFiOGQzN2Y4Njcz MjhkZjM5ZTRkYzYwOTNlOWU1MDA5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMTEtMDUg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29j b2FdIFJFR1JFU1NJT04ocjI2OTIxMSk6IFRleHQgd2l0aCBlbW9qaSBjYW4gdHJpZ2dlciBkcmF3 aW5nIGNvcnJ1cHRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxODYzNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzEwNjYwMTE+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3RleHQvZnJl cXVlbnQtdGV4dC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvZnJl cXVlbnQtdGV4dC5odG1sOiBBZGRlZC4KKwogMjAyMC0xMS0wNCAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIHdpbmRvdy5ldmVudCBtYXkgZ2V0IHNldCBvbiB3cm9u ZyBnbG9iYWwgd2hlbiBkaXNwYXRjaGluZyBhbiBldmVudApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC90ZXh0L2ZyZXF1ZW50LXRleHQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvdGV4dC9mcmVxdWVudC10ZXh0LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2Y3NTk4YTMx MzhmN2JiMzJhMjE0ZWU0NzliYzc3ZjUxOGMxMzU1YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvdGV4dC9mcmVxdWVudC10ZXh0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw5 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYt OCI+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgaWQ9InRhcmdldCI+SGVsbG8g8J+RiyA8c3BhbiBp ZD0iaW5zaWRlIj48L3NwYW4+IFdvcmxkITwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ZyZXF1ZW50LXRleHQuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvdGV4dC9mcmVxdWVudC10ZXh0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjk3YjYxY2IwNjI0 OGEwNzQxZWEyN2I5OWY1YWI2MGUzMGU5NzRiNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvdGV4dC9mcmVxdWVudC10ZXh0Lmh0bWwKQEAgLTAsMCArMSwzMCBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFk PgorPGJvZHk+Cis8ZGl2IGlkPSJ0YXJnZXQiPkhlbGxvIPCfkYsgPHNwYW4gaWQ9Imluc2lkZSI+ PC9zcGFuPiBXb3JsZCE8L2Rpdj4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisg ICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKK3dpbmRvdy5yZXF1ZXN0QW5pbWF0aW9u RnJhbWUoZnVuY3Rpb24oKSB7CisgICAgbGV0IHRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJ0YXJnZXQiKTsKKyAgICBsZXQgaW5zaWRlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo Imluc2lkZSIpOworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgIGZvciAobGV0 IGkgPSAwOyBpIDwgMjAwOyArK2kpCisgICAgICAgICAgICBpbnRlcm5hbHMuaW5jcmVtZW50RnJl cXVlbnRQYWludENvdW50ZXIodGFyZ2V0KTsKKyAgICB9CisgICAgaW5zaWRlLnRleHRDb250ZXh0 ID0gIm1pZGRsZSI7CisgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFtZShmdW5jdGlvbigp IHsKKyAgICAgICAgaW5zaWRlLnRleHRDb250ZXh0ID0gIiI7CisgICAgICAgIHdpbmRvdy5yZXF1 ZXN0QW5pbWF0aW9uRnJhbWUoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBpZiAod2luZG93LnRl c3RSdW5uZXIpCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAg ICAgIH0pOworICAgIH0pOworfSk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K