240560 2022-05-17 20:50:47 -0700 [LFC][FFC] Move visual/logical code to dedicated functions 2022-05-18 13:28:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1869911 0 zalan 2022-05-17 20:50:47 -0700 ssia 1869912 1 459523 zalan 2022-05-17 20:57:39 -0700 Created attachment 459523 Patch 1869913 2 459524 zalan 2022-05-17 21:18:15 -0700 Created attachment 459524 Patch 1869977 3 459524 koivisto 2022-05-18 06:09:16 -0700 Comment on attachment 459524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459524&action=review > Source/WebCore/ChangeLog:4 > + [LFC][FFC] Move visual/logical code to dedicated functions > + https://bugs.webkit.org/show_bug.cgi?id=240560 OMG ChangeLog 1870052 4 459548 zalan 2022-05-18 10:14:26 -0700 Created attachment 459548 Patch 1870053 5 459549 zalan 2022-05-18 10:17:22 -0700 Created attachment 459549 Patch 1870082 6 ews-feeder 2022-05-18 11:37:38 -0700 Committed r294412 (250704@main): <https://commits.webkit.org/250704@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459549. 1870083 7 webkit-bug-importer 2022-05-18 11:38:14 -0700 <rdar://problem/93516966> 459523 2022-05-17 20:57:39 -0700 2022-05-17 21:18:15 -0700 Patch Patch.txt text/plain 9277 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZGU0ZTQzN2FlYTUuLmM5OTJjNWY4NzUwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIyLTA1LTE3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICBbTEZDXVtGRkNdIE1vdmUgdmlzdWFsL2xvZ2ljYWwgY29kZSB0byBkZWRpY2F0 ZWQgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDA1NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgbW9yZSBwcmUvcG9zdCBjb3Jl IGxheW91dCBsb2dpYy4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxl eC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG bGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6c2V0RmxleEl0 ZW1zR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbik6CisgICAgICAgICgpOiBE ZWxldGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9y bWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlv dXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OkZsZXhMYXlvdXQ6OnVwZGF0ZVJlbmRlcmVycyBjb25zdCk6CisKIDIwMjItMDUt MTcgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBJbWFn ZUJ1ZmZlcklPU3VyZmFjZUJhY2tlbmQgY29udGV4dCBzZXR1cCBhbmQgdGVhcmRvd24gZnVuY3Rp b25zIGFyZSByZWR1bmRhbnQgYW5kIGVycm9yLXByb25lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4 Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDFmMGYzNzFiNzA4Ni4uNzNlZWU3ZWFiM2RmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgv RmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTE5LDIw ICsxMTksMTMgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1zKCkKICAgICB9CiB9CiAKLXN0cnVjdCBGbGV4SXRl bUxvZ2ljYWxCb3ggewotICAgIEZsZXhSZWN0IHJlY3Q7Ci0gICAgaW50IGxvZ2ljYWxPcmRlciB7 IDAgfTsKLSAgICBDaGVja2VkUHRyPGNvbnN0IENvbnRhaW5lckJveD4gZmxleEl0ZW07Ci19Owot Ci12b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVn cmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCitG bGV4Rm9ybWF0dGluZ0NvbnRleHQ6OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250 ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKQogewogICAgIGF1dG8mIGZvcm1h dHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwotICAgIFZlY3RvcjxGbGV4SXRl bUxvZ2ljYWxCb3g+IGxvZ2ljYWxGbGV4SXRlbUxpc3Q7CisgICAgTG9naWNhbEZsZXhJdGVtcyBs b2dpY2FsRmxleEl0ZW1MaXN0OwogICAgIGF1dG8gZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBm YWxzZTsKIAogICAgIGF1dG8gY29udmVydFZpc3VhbFRvTG9naWNhbCA9IFsmXSB7Ci0gICAgICAg IC8vIEZJWE1FOiBDb252ZXJ0IHZpc3VhbCAocm93L2NvbHVtbikgZGlyZWN0aW9uIHRvIGxvZ2lj YWwuCiAgICAgICAgIGF1dG8gZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlv bigpOwogICAgICAgICBhdXRvIHByZXZpb3VzTG9naWNhbE9yZGVyID0gc3RkOjpvcHRpb25hbDxp bnQ+IHsgfTsKIApAQCAtMTU4LDcgKzE1MSw2IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGCiAg ICAgICAgICAgICBwcmV2aW91c0xvZ2ljYWxPcmRlciA9IGZsZXhJdGVtT3JkZXI7CiAKICAgICAg ICAgICAgIGxvZ2ljYWxGbGV4SXRlbUxpc3QuYXBwZW5kKHsgeyBsb2dpY2FsU2l6ZSB9LCBmbGV4 SXRlbU9yZGVyLCAmZmxleEl0ZW0gfSk7Ci0KICAgICAgICAgfQogICAgIH07CiAgICAgY29udmVy dFZpc3VhbFRvTG9naWNhbCgpOwpAQCAtMTczLDYgKzE2NSw0NiBAQCB2b2lkIEZsZXhGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0 cmFpbnRzRgogICAgIH07CiAgICAgcmVvcmRlckZsZXhJdGVtc0lmQXBwbGljYWJsZSgpOwogCisg ICAgcmV0dXJuIGxvZ2ljYWxGbGV4SXRlbUxpc3Q7Cit9CisKK3ZvaWQgRmxleEZvcm1hdHRpbmdD b250ZXh0OjpzZXRGbGV4SXRlbXNHZW9tZXRyeShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiBsb2dp Y2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0 cmFpbnRzKQoreworICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdT dGF0ZSgpOworICAgIGF1dG8gbG9naWNhbFdpZHRoID0gbG9naWNhbEZsZXhJdGVtTGlzdC5sYXN0 KCkucmVjdC5yaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtTGlzdC5maXJzdCgpLnJlY3QubGVmdCgp OworICAgIGF1dG8gZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOwor ICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgewor ICAgICAgICBhdXRvJiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21l dHJ5KCpsb2dpY2FsRmxleEl0ZW0ubGF5b3V0Qm94KTsKKyAgICAgICAgYXV0byB0b3BMZWZ0ID0g TGF5b3V0UG9pbnQgeyB9OworCisgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CisgICAgICAg IGNhc2UgRmxleERpcmVjdGlvbjo6Um93OgorICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3Ry YWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QubGVm dCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3Ao KSB9OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Um93 UmV2ZXJzZToKKyAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwo KS5sb2dpY2FsUmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnJpZ2h0KCksIGNvbnN0cmFp bnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpIH07CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46IHsKKyAgICAg ICAgICAgIGF1dG8gZmxpcHBlZFRvcExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3BMZWZ0 KCkudHJhbnNwb3NlZFBvaW50KCk7CisgICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50 cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksIGNvbnN0cmFp bnRzLmxvZ2ljYWxUb3AoKSArIGZsaXBwZWRUb3BMZWZ0LnkoKSB9OworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIH0KKyAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW5SZXZlcnNl OgorICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2lj YWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxU b3AoKSArIGxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnJpZ2h0KCkgfTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBmbGV4 SXRlbUdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvcExlZnQpOworICAgICAgICBmbGV4SXRl bUdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aChsb2dpY2FsRmxleEl0ZW0ucmVjdC53aWR0aCgp IC0gZmxleEl0ZW1HZW9tZXRyeS5ob3Jpem9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsK KyAgICB9Cit9CisKK3ZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250 ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25z dHJhaW50cykKK3sKKyAgICBhdXRvIGxvZ2ljYWxGbGV4SXRlbUxpc3QgPSBjb252ZXJ0RmxleEl0 ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKKwogICAgIGF1dG8gbG9naWNhbExlZnQgPSBMYXlvdXRVbml0 IHsgfTsKICAgICBhdXRvIGxvZ2ljYWxUb3AgPSBMYXlvdXRVbml0IHsgfTsKIApAQCAtMTgwLDM4 ICsyMTIsNyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVu dEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRgogICAgICAgICBsb2dpY2FsRmxleEl0 ZW0ucmVjdC5zZXRUb3BMZWZ0KHsgbG9naWNhbExlZnQsIGxvZ2ljYWxUb3AgfSk7CiAgICAgICAg IGxvZ2ljYWxMZWZ0ID0gbG9naWNhbEZsZXhJdGVtLnJlY3QucmlnaHQoKTsKICAgICB9Ci0KLSAg ICBhdXRvIGNvbnZlcnRMb2dpY2FsVG9WaXN1YWwgPSBbJl0gewotICAgICAgICAvLyBGSVhNRTog Q29udmVydCBsb2dpY2FsIGNvb3JkaW5hdGVzIHRvIHZpc3VhbC4KLSAgICAgICAgYXV0byBsb2dp Y2FsV2lkdGggPSBsb2dpY2FsRmxleEl0ZW1MaXN0Lmxhc3QoKS5yZWN0LnJpZ2h0KCkgLSBsb2dp Y2FsRmxleEl0ZW1MaXN0LmZpcnN0KCkucmVjdC5sZWZ0KCk7Ci0gICAgICAgIGF1dG8gZGlyZWN0 aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOwotICAgICAgICBmb3IgKGF1dG8m IGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpIHsKLSAgICAgICAgICAgIGF1 dG8mIGZsZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmxvZ2lj YWxGbGV4SXRlbS5mbGV4SXRlbSk7Ci0gICAgICAgICAgICBhdXRvIHRvcExlZnQgPSBMYXlvdXRQ b2ludCB7IH07Ci0KLSAgICAgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7Ci0gICAgICAgICAg ICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvdzoKLSAgICAgICAgICAgICAgICB0b3BMZWZ0ID0geyBj b25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0ucmVj dC5sZWZ0KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0 LnRvcCgpIH07Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEZsZXhE aXJlY3Rpb246OlJvd1JldmVyc2U6Ci0gICAgICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3Ry YWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxSaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtLnJlY3Qu cmlnaHQoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLnJlY3Qu dG9wKCkgfTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgRmxleERp cmVjdGlvbjo6Q29sdW1uOiB7Ci0gICAgICAgICAgICAgICAgYXV0byBmbGlwcGVkVG9wTGVmdCA9 IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcExlZnQoKS50cmFuc3Bvc2VkUG9pbnQoKTsKLSAgICAg ICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbExl ZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGZsaXBw ZWRUb3BMZWZ0LnkoKSB9OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQot ICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW5SZXZlcnNlOgotICAgICAgICAg ICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCAr IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBs b2dpY2FsV2lkdGggLSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpIH07Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQot ICAgICAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b3BMZWZ0KTsK LSAgICAgICAgfQotICAgIH07Ci0gICAgY29udmVydExvZ2ljYWxUb1Zpc3VhbCgpOworICAgIHNl dEZsZXhJdGVtc0dlb21ldHJ5KGxvZ2ljYWxGbGV4SXRlbUxpc3QsIGNvbnN0cmFpbnRzKTsKIH0K IAogSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckludGVncmF0aW9uKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAxM2UzZmZlOWMwYzUuLjA4NTcwNGU2 NzY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaApAQCAtMjks NiArMjksNyBAQAogCiAjaW5jbHVkZSAiRmxleEZvcm1hdHRpbmdHZW9tZXRyeS5oIgogI2luY2x1 ZGUgIkZsZXhGb3JtYXR0aW5nU3RhdGUuaCIKKyNpbmNsdWRlICJGbGV4UmVjdC5oIgogI2luY2x1 ZGUgIkZvcm1hdHRpbmdRdWlya3MuaCIKICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9jLmg+CiAKQEAg LTU1LDYgKzU2LDE1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzaXplQW5kUGxhY2VGbGV4SXRlbXMo Y29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7CiAgICAgdm9pZCBjb21wdXRlSW50 cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckZsZXhJdGVtcygpOwogCisgICAgc3RydWN0IExvZ2lj YWxGbGV4SXRlbSB7CisgICAgICAgIEZsZXhSZWN0IHJlY3Q7CisgICAgICAgIGludCBsb2dpY2Fs T3JkZXIgeyAwIH07CisgICAgICAgIENoZWNrZWRQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBsYXlv dXRCb3g7CisgICAgfTsKKyAgICB1c2luZyBMb2dpY2FsRmxleEl0ZW1zID0gVmVjdG9yPExvZ2lj YWxGbGV4SXRlbT47CisgICAgTG9naWNhbEZsZXhJdGVtcyBjb252ZXJ0RmxleEl0ZW1zVG9Mb2dp Y2FsU3BhY2UoKTsKKyAgICB2b2lkIHNldEZsZXhJdGVtc0dlb21ldHJ5KGNvbnN0IExvZ2ljYWxG bGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmKTsKKwogICAgIGNv bnN0IEZsZXhGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJu IGRvd25jYXN0PEZsZXhGb3JtYXR0aW5nU3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0 aW5nU3RhdGUoKSk7IH0KICAgICBGbGV4Rm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUo KSB7IHJldHVybiBkb3duY2FzdDxGbGV4Rm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4 dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZs ZXhMYXlvdXQuY3BwCmluZGV4IDA3ZDFhMDZiNDEyMS4uNjA4OTA1MzdjZjc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRlZ3JhdGlv bkZsZXhMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9m bGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAKQEAgLTEzMSw3ICsxMzEsMTAgQEAg dm9pZCBGbGV4TGF5b3V0Ojp1cGRhdGVSZW5kZXJlcnMoKSBjb25zdAogICAgICAgICBhdXRvJiBs YXlvdXRCb3ggPSBib3hBbmRSZW5kZXJlci5ib3guZ2V0KCk7CiAKICAgICAgICAgYXV0byYgcmVu ZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJCb3g+KCpib3hBbmRSZW5kZXJlci5yZW5kZXJlcik7Ci0g ICAgICAgIHJlbmRlcmVyLnNldExvY2F0aW9uKExheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckJv eFRvcExlZnQobV9mbGV4Rm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxheW91dEJveCkpKTsK KyAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IG1fZmxleEZvcm1hdHRpbmdTdGF0ZS5i b3hHZW9tZXRyeShsYXlvdXRCb3gpOworICAgICAgICBhdXRvIGJvcmRlckJveCA9IExheW91dDo6 Qm94R2VvbWV0cnk6OmJvcmRlckJveFJlY3QoZmxleEl0ZW1HZW9tZXRyeSk7CisgICAgICAgIHJl bmRlcmVyLnNldExvY2F0aW9uKGJvcmRlckJveC50b3BMZWZ0KCkpOworICAgICAgICByZW5kZXJl ci5zZXRXaWR0aChib3JkZXJCb3gud2lkdGgoKSk7CiAgICAgfQogfQogCg== 459524 2022-05-17 21:18:15 -0700 2022-05-18 10:14:26 -0700 Patch Patch.txt text/plain 8370 zalan Y29tbWl0IDBkZmEzM2FhZTFiMDNjMjcyNTczNjMyZGY5Yjc4MWQ2ZTgwODdmYmMKQXV0aG9yOiBB bGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiAgIFR1ZSBNYXkgMTcgMjA6NTg6MDMg MjAyMiAtMDcwMAoKICAgIGRlZGljYXRlZCBmdW5jdGlvbnMKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRlNGU0 MzdhZWE1Li5jOTkyYzVmODc1MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMi0w NS0xNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRkZD XSBNb3ZlIHZpc3VhbC9sb2dpY2FsIGNvZGUgdG8gZGVkaWNhdGVkIGZ1bmN0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwNTYwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVw YXJhdGlvbiBmb3IgYWRkaW5nIG1vcmUgcHJlL3Bvc3QgY29yZSBsYXlvdXQgbG9naWMuCisKKyAg ICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0 Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OnNldEZsZXhJdGVtc0dlb21ldHJ5KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dD b250ZW50Rm9ySW50ZWdyYXRpb24pOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0Lmg6Cisg ICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5 b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpGbGV4TGF5b3V0 Ojp1cGRhdGVSZW5kZXJlcnMgY29uc3QpOgorCiAyMDIyLTA1LTE3ICBLaW1tbyBLaW5udW5lbiAg PGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1hZ2VCdWZmZXJJT1N1cmZhY2VCYWNr ZW5kIGNvbnRleHQgc2V0dXAgYW5kIHRlYXJkb3duIGZ1bmN0aW9ucyBhcmUgcmVkdW5kYW50IGFu ZCBlcnJvci1wcm9uZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNw cAppbmRleCAxZjBmMzcxYjcwODYuLjUyMDlmYTA4YTk0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTExOSwyMCArMTE5LDEzIEBAIHZvaWQgRmxl eEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckZs ZXhJdGVtcygpCiAgICAgfQogfQogCi1zdHJ1Y3QgRmxleEl0ZW1Mb2dpY2FsQm94IHsKLSAgICBG bGV4UmVjdCByZWN0OwotICAgIGludCBsb2dpY2FsT3JkZXIgeyAwIH07Ci0gICAgQ2hlY2tlZFB0 cjxjb25zdCBDb250YWluZXJCb3g+IGZsZXhJdGVtOwotfTsKLQotdm9pZCBGbGV4Rm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJh aW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQorRmxleEZvcm1hdHRpbmdDb250ZXh0 OjpMb2dpY2FsRmxleEl0ZW1zIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29udmVydEZsZXhJdGVt c1RvTG9naWNhbFNwYWNlKCkKIHsKICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5m b3JtYXR0aW5nU3RhdGUoKTsKLSAgICBWZWN0b3I8RmxleEl0ZW1Mb2dpY2FsQm94PiBsb2dpY2Fs RmxleEl0ZW1MaXN0OworICAgIExvZ2ljYWxGbGV4SXRlbXMgbG9naWNhbEZsZXhJdGVtTGlzdDsK ICAgICBhdXRvIGZsZXhJdGVtc05lZWRSZW9yZGVyaW5nID0gZmFsc2U7CiAKICAgICBhdXRvIGNv bnZlcnRWaXN1YWxUb0xvZ2ljYWwgPSBbJl0gewotICAgICAgICAvLyBGSVhNRTogQ29udmVydCB2 aXN1YWwgKHJvdy9jb2x1bW4pIGRpcmVjdGlvbiB0byBsb2dpY2FsLgogICAgICAgICBhdXRvIGRp cmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKICAgICAgICAgYXV0byBw cmV2aW91c0xvZ2ljYWxPcmRlciA9IHN0ZDo6b3B0aW9uYWw8aW50PiB7IH07CiAKQEAgLTE1OCw3 ICsxNTEsNiBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVu dEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRgogICAgICAgICAgICAgcHJldmlvdXNM b2dpY2FsT3JkZXIgPSBmbGV4SXRlbU9yZGVyOwogCiAgICAgICAgICAgICBsb2dpY2FsRmxleEl0 ZW1MaXN0LmFwcGVuZCh7IHsgbG9naWNhbFNpemUgfSwgZmxleEl0ZW1PcmRlciwgJmZsZXhJdGVt IH0pOwotCiAgICAgICAgIH0KICAgICB9OwogICAgIGNvbnZlcnRWaXN1YWxUb0xvZ2ljYWwoKTsK QEAgLTE3Myw2ICsxNjUsNDUgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0YKICAgICB9OwogICAg IHJlb3JkZXJGbGV4SXRlbXNJZkFwcGxpY2FibGUoKTsKIAorICAgIHJldHVybiBsb2dpY2FsRmxl eEl0ZW1MaXN0OworfQorCit2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6c2V0RmxleEl0ZW1z R2VvbWV0cnkoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYgbG9naWNhbEZsZXhJdGVtTGlzdCwgY29u c3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykKK3sKKyAgICBhdXRv JiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUoKTsKKyAgICBhdXRvIGxv Z2ljYWxXaWR0aCA9IGxvZ2ljYWxGbGV4SXRlbUxpc3QubGFzdCgpLnJlY3QucmlnaHQoKSAtIGxv Z2ljYWxGbGV4SXRlbUxpc3QuZmlyc3QoKS5yZWN0LmxlZnQoKTsKKyAgICBhdXRvIGRpcmVjdGlv biA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKKyAgICBmb3IgKGF1dG8mIGxvZ2lj YWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpIHsKKyAgICAgICAgYXV0byYgZmxleEl0 ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgqbG9naWNhbEZsZXhJdGVt LmxheW91dEJveCk7CisgICAgICAgIGF1dG8gdG9wTGVmdCA9IExheW91dFBvaW50IHsgfTsKKwor ICAgICAgICBzd2l0Y2ggKGRpcmVjdGlvbikgeworICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246 OlJvdzoKKyAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5s b2dpY2FsTGVmdCArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LmxlZnQoKSwgY29uc3RyYWludHMubG9n aWNhbFRvcCgpICsgbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCkgfTsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U6CisgICAgICAgICAg ICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFJpZ2h0KCkgLSBs b2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBs b2dpY2FsRmxleEl0ZW0ucmVjdC50b3AoKSB9OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGNhc2UgRmxleERpcmVjdGlvbjo6Q29sdW1uOiB7CisgICAgICAgICAgICBhdXRvIGZsaXBwZWRU b3BMZWZ0ID0gbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wTGVmdCgpLnRyYW5zcG9zZWRQb2ludCgp OworICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2lj YWxMZWZ0ICsgZmxpcHBlZFRvcExlZnQueCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBm bGlwcGVkVG9wTGVmdC55KCkgfTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAg ICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Q29sdW1uUmV2ZXJzZToKKyAgICAgICAgICAgIHRvcExl ZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCArIGxvZ2ljYWxGbGV4 SXRlbS5yZWN0LnRvcCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkgKyBsb2dpY2FsV2lkdGgg LSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpIH07CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRMb2dp Y2FsVG9wTGVmdCh0b3BMZWZ0KTsKKyAgICB9Cit9CisKK3ZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG b3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykKK3sKKyAgICBhdXRvIGxvZ2ljYWxGbGV4SXRl bUxpc3QgPSBjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKKwogICAgIGF1dG8gbG9n aWNhbExlZnQgPSBMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGxvZ2ljYWxUb3AgPSBMYXlvdXRV bml0IHsgfTsKIApAQCAtMTgwLDM4ICsyMTEsNyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRgog ICAgICAgICBsb2dpY2FsRmxleEl0ZW0ucmVjdC5zZXRUb3BMZWZ0KHsgbG9naWNhbExlZnQsIGxv Z2ljYWxUb3AgfSk7CiAgICAgICAgIGxvZ2ljYWxMZWZ0ID0gbG9naWNhbEZsZXhJdGVtLnJlY3Qu cmlnaHQoKTsKICAgICB9Ci0KLSAgICBhdXRvIGNvbnZlcnRMb2dpY2FsVG9WaXN1YWwgPSBbJl0g ewotICAgICAgICAvLyBGSVhNRTogQ29udmVydCBsb2dpY2FsIGNvb3JkaW5hdGVzIHRvIHZpc3Vh bC4KLSAgICAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBsb2dpY2FsRmxleEl0ZW1MaXN0Lmxhc3Qo KS5yZWN0LnJpZ2h0KCkgLSBsb2dpY2FsRmxleEl0ZW1MaXN0LmZpcnN0KCkucmVjdC5sZWZ0KCk7 Ci0gICAgICAgIGF1dG8gZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigp OwotICAgICAgICBmb3IgKGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxp c3QpIHsKLSAgICAgICAgICAgIGF1dG8mIGZsZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3Rh dGUuYm94R2VvbWV0cnkoKmxvZ2ljYWxGbGV4SXRlbS5mbGV4SXRlbSk7Ci0gICAgICAgICAgICBh dXRvIHRvcExlZnQgPSBMYXlvdXRQb2ludCB7IH07Ci0KLSAgICAgICAgICAgIHN3aXRjaCAoZGly ZWN0aW9uKSB7Ci0gICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvdzoKLSAgICAgICAg ICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQg KyBsb2dpY2FsRmxleEl0ZW0ucmVjdC5sZWZ0KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSAr IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpIH07Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U6Ci0gICAgICAgICAgICAg ICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxSaWdodCgpIC0g bG9naWNhbEZsZXhJdGVtLnJlY3QucmlnaHQoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsg bG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCkgfTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Q29sdW1uOiB7Ci0gICAgICAgICAgICAgICAg YXV0byBmbGlwcGVkVG9wTGVmdCA9IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcExlZnQoKS50cmFu c3Bvc2VkUG9pbnQoKTsKLSAgICAgICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5o b3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksIGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3AoKSArIGZsaXBwZWRUb3BMZWZ0LnkoKSB9OwotICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1 bW5SZXZlcnNlOgotICAgICAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6 b250YWwoKS5sb2dpY2FsTGVmdCArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpLCBjb25zdHJh aW50cy5sb2dpY2FsVG9wKCkgKyBsb2dpY2FsV2lkdGggLSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5y aWdodCgpIH07Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBkZWZhdWx0Ogot ICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZmxleEl0ZW1HZW9tZXRyeS5zZXRMb2dp Y2FsVG9wTGVmdCh0b3BMZWZ0KTsKLSAgICAgICAgfQotICAgIH07Ci0gICAgY29udmVydExvZ2lj YWxUb1Zpc3VhbCgpOworICAgIHNldEZsZXhJdGVtc0dlb21ldHJ5KGxvZ2ljYWxGbGV4SXRlbUxp c3QsIGNvbnN0cmFpbnRzKTsKIH0KIAogSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBGbGV4Rm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckludGVn cmF0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAx M2UzZmZlOWMwYzUuLjA4NTcwNGU2NzY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0 dGluZ0NvbnRleHQuaApAQCAtMjksNiArMjksNyBAQAogCiAjaW5jbHVkZSAiRmxleEZvcm1hdHRp bmdHZW9tZXRyeS5oIgogI2luY2x1ZGUgIkZsZXhGb3JtYXR0aW5nU3RhdGUuaCIKKyNpbmNsdWRl ICJGbGV4UmVjdC5oIgogI2luY2x1ZGUgIkZvcm1hdHRpbmdRdWlya3MuaCIKICNpbmNsdWRlIDx3 dGYvSXNvTWFsbG9jLmg+CiAKQEAgLTU1LDYgKzU2LDE1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBz aXplQW5kUGxhY2VGbGV4SXRlbXMoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50Jik7 CiAgICAgdm9pZCBjb21wdXRlSW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckZsZXhJdGVtcygp OwogCisgICAgc3RydWN0IExvZ2ljYWxGbGV4SXRlbSB7CisgICAgICAgIEZsZXhSZWN0IHJlY3Q7 CisgICAgICAgIGludCBsb2dpY2FsT3JkZXIgeyAwIH07CisgICAgICAgIENoZWNrZWRQdHI8Y29u c3QgQ29udGFpbmVyQm94PiBsYXlvdXRCb3g7CisgICAgfTsKKyAgICB1c2luZyBMb2dpY2FsRmxl eEl0ZW1zID0gVmVjdG9yPExvZ2ljYWxGbGV4SXRlbT47CisgICAgTG9naWNhbEZsZXhJdGVtcyBj b252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKKyAgICB2b2lkIHNldEZsZXhJdGVtc0dl b21ldHJ5KGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckluRmxv d0NvbnRlbnQmKTsKKwogICAgIGNvbnN0IEZsZXhGb3JtYXR0aW5nU3RhdGUmIGZvcm1hdHRpbmdT dGF0ZSgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEZsZXhGb3JtYXR0aW5nU3RhdGU+KEZvcm1h dHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KICAgICBGbGV4Rm9ybWF0dGluZ1N0 YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSB7IHJldHVybiBkb3duY2FzdDxGbGV4Rm9ybWF0dGluZ1N0 YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiAK 459548 2022-05-18 10:14:26 -0700 2022-05-18 10:17:20 -0700 Patch Patch.txt text/plain 7804 zalan Y29tbWl0IDY0ODk2OTY5Njc4OTIzN2EwNWE4MzRjYjI0MWQxNTUzYjc4ZTFlMGUKQXV0aG9yOiBB bGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiAgIFdlZCBNYXkgMTggMTA6MTI6MzUg MjAyMiAtMDcwMAoKICAgIFtMRkNdW0ZGQ10gTW92ZSB2aXN1YWwvbG9naWNhbCBjb2RlIHRvIGRl ZGljYXRlZCBmdW5jdGlvbnMKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDA1NjAKICAgIAogICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCiAgICAKICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBtb3JlIHByZS9wb3N0IGNvcmUgbGF5 b3V0IGxvZ2ljLgogICAgCiAgICAqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgogICAgKFdlYkNvcmU6OkxheW91 dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2Up OgogICAgKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRGbGV4SXRl bXNHZW9tZXRyeSk6CiAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbik6CiAgICAoKTogRGVsZXRlZC4KICAg ICogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3Jt YXR0aW5nQ29udGV4dC5oOgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggMWYwZjM3MWI3MDg2Li41MjA5ZmEwOGE5NDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0Nv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTksMjAgKzExOSwxMyBAQCB2b2lk IEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNG b3JGbGV4SXRlbXMoKQogICAgIH0KIH0KIAotc3RydWN0IEZsZXhJdGVtTG9naWNhbEJveCB7Ci0g ICAgRmxleFJlY3QgcmVjdDsKLSAgICBpbnQgbG9naWNhbE9yZGVyIHsgMCB9OwotICAgIENoZWNr ZWRQdHI8Y29uc3QgQ29udGFpbmVyQm94PiBmbGV4SXRlbTsKLX07Ci0KLXZvaWQgRmxleEZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29u c3RyYWludHNGb3JJbkZsb3dDb250ZW50JiBjb25zdHJhaW50cykKK0ZsZXhGb3JtYXR0aW5nQ29u dGV4dDo6TG9naWNhbEZsZXhJdGVtcyBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbnZlcnRGbGV4 SXRlbXNUb0xvZ2ljYWxTcGFjZSgpCiB7CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhp cy0+Zm9ybWF0dGluZ1N0YXRlKCk7Ci0gICAgVmVjdG9yPEZsZXhJdGVtTG9naWNhbEJveD4gbG9n aWNhbEZsZXhJdGVtTGlzdDsKKyAgICBMb2dpY2FsRmxleEl0ZW1zIGxvZ2ljYWxGbGV4SXRlbUxp c3Q7CiAgICAgYXV0byBmbGV4SXRlbXNOZWVkUmVvcmRlcmluZyA9IGZhbHNlOwogCiAgICAgYXV0 byBjb252ZXJ0VmlzdWFsVG9Mb2dpY2FsID0gWyZdIHsKLSAgICAgICAgLy8gRklYTUU6IENvbnZl cnQgdmlzdWFsIChyb3cvY29sdW1uKSBkaXJlY3Rpb24gdG8gbG9naWNhbC4KICAgICAgICAgYXV0 byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CiAgICAgICAgIGF1 dG8gcHJldmlvdXNMb2dpY2FsT3JkZXIgPSBzdGQ6Om9wdGlvbmFsPGludD4geyB9OwogCkBAIC0x NTgsNyArMTUxLDYgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0Nv bnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50c0YKICAgICAgICAgICAgIHByZXZp b3VzTG9naWNhbE9yZGVyID0gZmxleEl0ZW1PcmRlcjsKIAogICAgICAgICAgICAgbG9naWNhbEZs ZXhJdGVtTGlzdC5hcHBlbmQoeyB7IGxvZ2ljYWxTaXplIH0sIGZsZXhJdGVtT3JkZXIsICZmbGV4 SXRlbSB9KTsKLQogICAgICAgICB9CiAgICAgfTsKICAgICBjb252ZXJ0VmlzdWFsVG9Mb2dpY2Fs KCk7CkBAIC0xNzMsNiArMTY1LDQ1IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlv dXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGCiAgICAgfTsK ICAgICByZW9yZGVyRmxleEl0ZW1zSWZBcHBsaWNhYmxlKCk7CiAKKyAgICByZXR1cm4gbG9naWNh bEZsZXhJdGVtTGlzdDsKK30KKwordm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OnNldEZsZXhJ dGVtc0dlb21ldHJ5KGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmIGxvZ2ljYWxGbGV4SXRlbUxpc3Qs IGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCit7CisgICAg YXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7CisgICAgYXV0 byBsb2dpY2FsV2lkdGggPSBsb2dpY2FsRmxleEl0ZW1MaXN0Lmxhc3QoKS5yZWN0LnJpZ2h0KCkg LSBsb2dpY2FsRmxleEl0ZW1MaXN0LmZpcnN0KCkucmVjdC5sZWZ0KCk7CisgICAgYXV0byBkaXJl Y3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CisgICAgZm9yIChhdXRvJiBs b2dpY2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0KSB7CisgICAgICAgIGF1dG8mIGZs ZXhJdGVtR2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkoKmxvZ2ljYWxGbGV4 SXRlbS5sYXlvdXRCb3gpOworICAgICAgICBhdXRvIHRvcExlZnQgPSBMYXlvdXRQb2ludCB7IH07 CisKKyAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsKKyAgICAgICAgY2FzZSBGbGV4RGlyZWN0 aW9uOjpSb3c6CisgICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFs KCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0ucmVjdC5sZWZ0KCksIGNvbnN0cmFpbnRz LmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpIH07CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpSb3dSZXZlcnNlOgorICAgICAg ICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxSaWdodCgp IC0gbG9naWNhbEZsZXhJdGVtLnJlY3QucmlnaHQoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgp ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCkgfTsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVtbjogeworICAgICAgICAgICAgYXV0byBmbGlw cGVkVG9wTGVmdCA9IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcExlZnQoKS50cmFuc3Bvc2VkUG9p bnQoKTsKKyAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5s b2dpY2FsTGVmdCArIGZsaXBwZWRUb3BMZWZ0LngoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgp ICsgZmxpcHBlZFRvcExlZnQueSgpIH07CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor ICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVtblJldmVyc2U6CisgICAgICAgICAgICB0 b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2Fs RmxleEl0ZW0ucmVjdC50b3AoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbFdp ZHRoIC0gbG9naWNhbEZsZXhJdGVtLnJlY3QucmlnaHQoKSB9OworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQodG9wTGVmdCk7CisgICAgfQorfQorCit2b2lkIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCit7CisgICAgYXV0byBsb2dpY2FsRmxl eEl0ZW1MaXN0ID0gY29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNlKCk7CisKICAgICBhdXRv IGxvZ2ljYWxMZWZ0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byBsb2dpY2FsVG9wID0gTGF5 b3V0VW5pdCB7IH07CiAKQEAgLTE4MCwzOCArMjExLDcgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50 c0YKICAgICAgICAgbG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0VG9wTGVmdCh7IGxvZ2ljYWxMZWZ0 LCBsb2dpY2FsVG9wIH0pOwogICAgICAgICBsb2dpY2FsTGVmdCA9IGxvZ2ljYWxGbGV4SXRlbS5y ZWN0LnJpZ2h0KCk7CiAgICAgfQotCi0gICAgYXV0byBjb252ZXJ0TG9naWNhbFRvVmlzdWFsID0g WyZdIHsKLSAgICAgICAgLy8gRklYTUU6IENvbnZlcnQgbG9naWNhbCBjb29yZGluYXRlcyB0byB2 aXN1YWwuCi0gICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gbG9naWNhbEZsZXhJdGVtTGlzdC5s YXN0KCkucmVjdC5yaWdodCgpIC0gbG9naWNhbEZsZXhJdGVtTGlzdC5maXJzdCgpLnJlY3QubGVm dCgpOwotICAgICAgICBhdXRvIGRpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmZsZXhEaXJlY3Rp b24oKTsKLSAgICAgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0 ZW1MaXN0KSB7Ci0gICAgICAgICAgICBhdXRvJiBmbGV4SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGlu Z1N0YXRlLmJveEdlb21ldHJ5KCpsb2dpY2FsRmxleEl0ZW0uZmxleEl0ZW0pOwotICAgICAgICAg ICAgYXV0byB0b3BMZWZ0ID0gTGF5b3V0UG9pbnQgeyB9OwotCi0gICAgICAgICAgICBzd2l0Y2gg KGRpcmVjdGlvbikgewotICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpSb3c6Ci0gICAg ICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxM ZWZ0ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QubGVmdCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9w KCkgKyBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3AoKSB9OwotICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpSb3dSZXZlcnNlOgotICAgICAgICAg ICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsUmlnaHQo KSAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnJpZ2h0KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3Ao KSArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpIH07Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNvbHVtbjogewotICAgICAgICAgICAg ICAgIGF1dG8gZmxpcHBlZFRvcExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3BMZWZ0KCku dHJhbnNwb3NlZFBvaW50KCk7Ci0gICAgICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWlu dHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgZmxpcHBlZFRvcExlZnQueCgpLCBjb25zdHJh aW50cy5sb2dpY2FsVG9wKCkgKyBmbGlwcGVkVG9wTGVmdC55KCkgfTsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6 Q29sdW1uUmV2ZXJzZToKLSAgICAgICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5o b3Jpem9udGFsKCkubG9naWNhbExlZnQgKyBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3AoKSwgY29u c3RyYWludHMubG9naWNhbFRvcCgpICsgbG9naWNhbFdpZHRoIC0gbG9naWNhbEZsZXhJdGVtLnJl Y3QucmlnaHQoKSB9OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVs dDoKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGZsZXhJdGVtR2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQodG9wTGVmdCk7Ci0gICAgICAgIH0KLSAgICB9OwotICAgIGNvbnZlcnRM b2dpY2FsVG9WaXN1YWwoKTsKKyAgICBzZXRGbGV4SXRlbXNHZW9tZXRyeShsb2dpY2FsRmxleEl0 ZW1MaXN0LCBjb25zdHJhaW50cyk7CiB9CiAKIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgRmxl eEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JJ bnRlZ3JhdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKaW5k ZXggMTNlM2ZmZTljMGM1Li4wODU3MDRlNjc2OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZv cm1hdHRpbmdDb250ZXh0LmgKQEAgLTI5LDYgKzI5LDcgQEAKIAogI2luY2x1ZGUgIkZsZXhGb3Jt YXR0aW5nR2VvbWV0cnkuaCIKICNpbmNsdWRlICJGbGV4Rm9ybWF0dGluZ1N0YXRlLmgiCisjaW5j bHVkZSAiRmxleFJlY3QuaCIKICNpbmNsdWRlICJGb3JtYXR0aW5nUXVpcmtzLmgiCiAjaW5jbHVk ZSA8d3RmL0lzb01hbGxvYy5oPgogCkBAIC01NSw2ICs1NiwxNSBAQCBwcml2YXRlOgogICAgIHZv aWQgc2l6ZUFuZFBsYWNlRmxleEl0ZW1zKGNvbnN0IENvbnN0cmFpbnRzRm9ySW5GbG93Q29udGVu dCYpOwogICAgIHZvaWQgY29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRl bXMoKTsKIAorICAgIHN0cnVjdCBMb2dpY2FsRmxleEl0ZW0geworICAgICAgICBGbGV4UmVjdCBy ZWN0OworICAgICAgICBpbnQgbG9naWNhbE9yZGVyIHsgMCB9OworICAgICAgICBDaGVja2VkUHRy PGNvbnN0IENvbnRhaW5lckJveD4gbGF5b3V0Qm94OworICAgIH07CisgICAgdXNpbmcgTG9naWNh bEZsZXhJdGVtcyA9IFZlY3RvcjxMb2dpY2FsRmxleEl0ZW0+OworICAgIExvZ2ljYWxGbGV4SXRl bXMgY29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNlKCk7CisgICAgdm9pZCBzZXRGbGV4SXRl bXNHZW9tZXRyeShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiwgY29uc3QgQ29uc3RyYWludHNGb3JJ bkZsb3dDb250ZW50Jik7CisKICAgICBjb25zdCBGbGV4Rm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0 aW5nU3RhdGUoKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxGbGV4Rm9ybWF0dGluZ1N0YXRlPihG b3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiAgICAgRmxleEZvcm1hdHRp bmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgeyByZXR1cm4gZG93bmNhc3Q8RmxleEZvcm1hdHRp bmdTdGF0ZT4oRm9ybWF0dGluZ0NvbnRleHQ6OmZvcm1hdHRpbmdTdGF0ZSgpKTsgfQogCg== 459549 2022-05-18 10:17:22 -0700 2022-05-18 13:28:48 -0700 Patch bug-240560-20220518101721.patch text/plain 8001 zalan RnJvbSA2NDg5Njk2OTY3ODkyMzdhMDVhODM0Y2IyNDFkMTU1M2I3OGUxZTBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDE4IE1heSAyMDIyIDEwOjEyOjM1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBNb3ZlIHZpc3VhbC9sb2dpY2FsIGNvZGUgdG8gZGVkaWNhdGVkIGZ1bmN0aW9ucwogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDU2MAoKUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgbW9yZSBwcmUv cG9zdCBjb3JlIGxheW91dCBsb2dpYy4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlv dXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNl KToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRGbGV4SXRlbXNH ZW9tZXRyeSk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKToKKCk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5o OgotLS0KIC4uLi9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgICB8IDg0 ICsrKysrKysrKy0tLS0tLS0tLS0KIC4uLi9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oICAg ICAgICAgICAgICB8IDEwICsrKwogMiBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCA0 MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQu Y3BwCmluZGV4IDFmMGYzNzFiNzA4Ni4uNTIwOWZhMDhhOTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Zs ZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTE5LDIwICsxMTksMTMgQEAgdm9pZCBG bGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9y RmxleEl0ZW1zKCkKICAgICB9CiB9CiAKLXN0cnVjdCBGbGV4SXRlbUxvZ2ljYWxCb3ggewotICAg IEZsZXhSZWN0IHJlY3Q7Ci0gICAgaW50IGxvZ2ljYWxPcmRlciB7IDAgfTsKLSAgICBDaGVja2Vk UHRyPGNvbnN0IENvbnRhaW5lckJveD4gZmxleEl0ZW07Ci19OwotCi12b2lkIEZsZXhGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0 cmFpbnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCitGbGV4Rm9ybWF0dGluZ0NvbnRl eHQ6OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252ZXJ0RmxleEl0 ZW1zVG9Mb2dpY2FsU3BhY2UoKQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMt PmZvcm1hdHRpbmdTdGF0ZSgpOwotICAgIFZlY3RvcjxGbGV4SXRlbUxvZ2ljYWxCb3g+IGxvZ2lj YWxGbGV4SXRlbUxpc3Q7CisgICAgTG9naWNhbEZsZXhJdGVtcyBsb2dpY2FsRmxleEl0ZW1MaXN0 OwogICAgIGF1dG8gZmxleEl0ZW1zTmVlZFJlb3JkZXJpbmcgPSBmYWxzZTsKIAogICAgIGF1dG8g Y29udmVydFZpc3VhbFRvTG9naWNhbCA9IFsmXSB7Ci0gICAgICAgIC8vIEZJWE1FOiBDb252ZXJ0 IHZpc3VhbCAocm93L2NvbHVtbikgZGlyZWN0aW9uIHRvIGxvZ2ljYWwuCiAgICAgICAgIGF1dG8g ZGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOwogICAgICAgICBhdXRv IHByZXZpb3VzTG9naWNhbE9yZGVyID0gc3RkOjpvcHRpb25hbDxpbnQ+IHsgfTsKIApAQCAtMTU4 LDcgKzE1MSw2IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250 ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNGCiAgICAgICAgICAgICBwcmV2aW91 c0xvZ2ljYWxPcmRlciA9IGZsZXhJdGVtT3JkZXI7CiAKICAgICAgICAgICAgIGxvZ2ljYWxGbGV4 SXRlbUxpc3QuYXBwZW5kKHsgeyBsb2dpY2FsU2l6ZSB9LCBmbGV4SXRlbU9yZGVyLCAmZmxleEl0 ZW0gfSk7Ci0KICAgICAgICAgfQogICAgIH07CiAgICAgY29udmVydFZpc3VhbFRvTG9naWNhbCgp OwpAQCAtMTczLDYgKzE2NSw0NSBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFpbnRzRgogICAgIH07CiAg ICAgcmVvcmRlckZsZXhJdGVtc0lmQXBwbGljYWJsZSgpOwogCisgICAgcmV0dXJuIGxvZ2ljYWxG bGV4SXRlbUxpc3Q7Cit9CisKK3ZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjpzZXRGbGV4SXRl bXNHZW9tZXRyeShjb25zdCBMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBj b25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQoreworICAgIGF1 dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOworICAgIGF1dG8g bG9naWNhbFdpZHRoID0gbG9naWNhbEZsZXhJdGVtTGlzdC5sYXN0KCkucmVjdC5yaWdodCgpIC0g bG9naWNhbEZsZXhJdGVtTGlzdC5maXJzdCgpLnJlY3QubGVmdCgpOworICAgIGF1dG8gZGlyZWN0 aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgIGZvciAoYXV0byYgbG9n aWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgeworICAgICAgICBhdXRvJiBmbGV4 SXRlbUdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KCpsb2dpY2FsRmxleEl0 ZW0ubGF5b3V0Qm94KTsKKyAgICAgICAgYXV0byB0b3BMZWZ0ID0gTGF5b3V0UG9pbnQgeyB9Owor CisgICAgICAgIHN3aXRjaCAoZGlyZWN0aW9uKSB7CisgICAgICAgIGNhc2UgRmxleERpcmVjdGlv bjo6Um93OgorICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgp LmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QubGVmdCgpLCBjb25zdHJhaW50cy5s b2dpY2FsVG9wKCkgKyBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3AoKSB9OworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZToKKyAgICAgICAg ICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsUmlnaHQoKSAt IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnJpZ2h0KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSAr IGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnRvcCgpIH07CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46IHsKKyAgICAgICAgICAgIGF1dG8gZmxpcHBl ZFRvcExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3BMZWZ0KCkudHJhbnNwb3NlZFBvaW50 KCk7CisgICAgICAgICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9n aWNhbExlZnQgKyBmbGlwcGVkVG9wTGVmdC54KCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSAr IGZsaXBwZWRUb3BMZWZ0LnkoKSB9OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAg ICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW5SZXZlcnNlOgorICAgICAgICAgICAgdG9w TGVmdCA9IHsgY29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZs ZXhJdGVtLnJlY3QudG9wKCksIGNvbnN0cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxXaWR0 aCAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnJpZ2h0KCkgfTsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldExv Z2ljYWxUb3BMZWZ0KHRvcExlZnQpOworICAgIH0KK30KKwordm9pZCBGbGV4Rm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBDb25zdHJhaW50 c0ZvckluRmxvd0NvbnRlbnQmIGNvbnN0cmFpbnRzKQoreworICAgIGF1dG8gbG9naWNhbEZsZXhJ dGVtTGlzdCA9IGNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSgpOworCiAgICAgYXV0byBs b2dpY2FsTGVmdCA9IExheW91dFVuaXQgeyB9OwogICAgIGF1dG8gbG9naWNhbFRvcCA9IExheW91 dFVuaXQgeyB9OwogCkBAIC0xODAsMzggKzIxMSw3IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG CiAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnNldFRvcExlZnQoeyBsb2dpY2FsTGVmdCwg bG9naWNhbFRvcCB9KTsKICAgICAgICAgbG9naWNhbExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ucmVj dC5yaWdodCgpOwogICAgIH0KLQotICAgIGF1dG8gY29udmVydExvZ2ljYWxUb1Zpc3VhbCA9IFsm XSB7Ci0gICAgICAgIC8vIEZJWE1FOiBDb252ZXJ0IGxvZ2ljYWwgY29vcmRpbmF0ZXMgdG8gdmlz dWFsLgotICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxGbGV4SXRlbUxpc3QubGFz dCgpLnJlY3QucmlnaHQoKSAtIGxvZ2ljYWxGbGV4SXRlbUxpc3QuZmlyc3QoKS5yZWN0LmxlZnQo KTsKLSAgICAgICAgYXV0byBkaXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9u KCk7Ci0gICAgICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVt TGlzdCkgewotICAgICAgICAgICAgYXV0byYgZmxleEl0ZW1HZW9tZXRyeSA9IGZvcm1hdHRpbmdT dGF0ZS5ib3hHZW9tZXRyeSgqbG9naWNhbEZsZXhJdGVtLmZsZXhJdGVtKTsKLSAgICAgICAgICAg IGF1dG8gdG9wTGVmdCA9IExheW91dFBvaW50IHsgfTsKLQotICAgICAgICAgICAgc3dpdGNoIChk aXJlY3Rpb24pIHsKLSAgICAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Um93OgotICAgICAg ICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRzLmhvcml6b250YWwoKS5sb2dpY2FsTGVm dCArIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LmxlZnQoKSwgY29uc3RyYWludHMubG9naWNhbFRvcCgp ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCkgfTsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIGNhc2UgRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZToKLSAgICAgICAgICAg ICAgICB0b3BMZWZ0ID0geyBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFJpZ2h0KCkg LSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpLCBjb25zdHJhaW50cy5sb2dpY2FsVG9wKCkg KyBsb2dpY2FsRmxleEl0ZW0ucmVjdC50b3AoKSB9OwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgY2FzZSBGbGV4RGlyZWN0aW9uOjpDb2x1bW46IHsKLSAgICAgICAgICAgICAg ICBhdXRvIGZsaXBwZWRUb3BMZWZ0ID0gbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wTGVmdCgpLnRy YW5zcG9zZWRQb2ludCgpOwotICAgICAgICAgICAgICAgIHRvcExlZnQgPSB7IGNvbnN0cmFpbnRz Lmhvcml6b250YWwoKS5sb2dpY2FsTGVmdCArIGZsaXBwZWRUb3BMZWZ0LngoKSwgY29uc3RyYWlu dHMubG9naWNhbFRvcCgpICsgZmxpcHBlZFRvcExlZnQueSgpIH07Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBjYXNlIEZsZXhEaXJlY3Rpb246OkNv bHVtblJldmVyc2U6Ci0gICAgICAgICAgICAgICAgdG9wTGVmdCA9IHsgY29uc3RyYWludHMuaG9y aXpvbnRhbCgpLmxvZ2ljYWxMZWZ0ICsgbG9naWNhbEZsZXhJdGVtLnJlY3QudG9wKCksIGNvbnN0 cmFpbnRzLmxvZ2ljYWxUb3AoKSArIGxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0 LnJpZ2h0KCkgfTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6 Ci0gICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBmbGV4SXRlbUdlb21ldHJ5LnNldExv Z2ljYWxUb3BMZWZ0KHRvcExlZnQpOwotICAgICAgICB9Ci0gICAgfTsKLSAgICBjb252ZXJ0TG9n aWNhbFRvVmlzdWFsKCk7CisgICAgc2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJdGVt TGlzdCwgY29uc3RyYWludHMpOwogfQogCiBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEZsZXhG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50 ZWdyYXRpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4 IDEzZTNmZmU5YzBjNS4uMDg1NzA0ZTY3NjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC0yOSw2ICsyOSw3IEBACiAKICNpbmNsdWRlICJGbGV4Rm9ybWF0 dGluZ0dlb21ldHJ5LmgiCiAjaW5jbHVkZSAiRmxleEZvcm1hdHRpbmdTdGF0ZS5oIgorI2luY2x1 ZGUgIkZsZXhSZWN0LmgiCiAjaW5jbHVkZSAiRm9ybWF0dGluZ1F1aXJrcy5oIgogI2luY2x1ZGUg PHd0Zi9Jc29NYWxsb2MuaD4KIApAQCAtNTUsNiArNTYsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lk IHNpemVBbmRQbGFjZUZsZXhJdGVtcyhjb25zdCBDb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQm KTsKICAgICB2b2lkIGNvbXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yRmxleEl0ZW1z KCk7CiAKKyAgICBzdHJ1Y3QgTG9naWNhbEZsZXhJdGVtIHsKKyAgICAgICAgRmxleFJlY3QgcmVj dDsKKyAgICAgICAgaW50IGxvZ2ljYWxPcmRlciB7IDAgfTsKKyAgICAgICAgQ2hlY2tlZFB0cjxj b25zdCBDb250YWluZXJCb3g+IGxheW91dEJveDsKKyAgICB9OworICAgIHVzaW5nIExvZ2ljYWxG bGV4SXRlbXMgPSBWZWN0b3I8TG9naWNhbEZsZXhJdGVtPjsKKyAgICBMb2dpY2FsRmxleEl0ZW1z IGNvbnZlcnRGbGV4SXRlbXNUb0xvZ2ljYWxTcGFjZSgpOworICAgIHZvaWQgc2V0RmxleEl0ZW1z R2VvbWV0cnkoY29uc3QgTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0IENvbnN0cmFpbnRzRm9ySW5G bG93Q29udGVudCYpOworCiAgICAgY29uc3QgRmxleEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGlu Z1N0YXRlKCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8RmxleEZvcm1hdHRpbmdTdGF0ZT4oRm9y bWF0dGluZ0NvbnRleHQ6OmZvcm1hdHRpbmdTdGF0ZSgpKTsgfQogICAgIEZsZXhGb3JtYXR0aW5n U3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIHsgcmV0dXJuIGRvd25jYXN0PEZsZXhGb3JtYXR0aW5n U3RhdGU+KEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUoKSk7IH0KIAotLSAKMi4z Mi4wIChBcHBsZSBHaXQtMTMyKQoK