236677 2022-02-15 16:16:38 -0800 [LFC][IFC] 'vertical-align: bottom' makes inline level boxes stick out of their parent block box 2022-02-17 18:53:22 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1842011 0 zalan 2022-02-15 16:16:38 -0800 ssia 1842034 1 452112 zalan 2022-02-15 16:57:11 -0800 Created attachment 452112 Patch 1842693 2 452307 zalan 2022-02-16 21:15:10 -0800 Created attachment 452307 Patch 1842914 3 452373 zalan 2022-02-17 08:28:18 -0800 Created attachment 452373 Patch 1843237 4 ews-feeder 2022-02-17 18:52:49 -0800 Committed r290105 (247451@main): <https://commits.webkit.org/247451@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452373. 1843238 5 webkit-bug-importer 2022-02-17 18:53:22 -0800 <rdar://problem/89121564> 452112 2022-02-15 16:57:11 -0800 2022-02-16 21:15:07 -0800 Patch bug-236677-20220215165711.patch text/plain 15414 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU3Njk5ZGY4MGFlYTBl NTRmYTFiOTA3NWFlYWFlYWQzYWU5NWNjMi4uMzlmZjMyNTI5NDQ1ZGFjYWVmNDMxMjcxOWY2MmRh MjA3OWNiMGJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTAyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdICd2ZXJ0aWNh bC1hbGlnbjogYm90dG9tJyBtYWtlcyBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRo ZWlyIHBhcmVudCBibG9jayBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICd2ZXJ0aWNhbC1hbGlnbjogYm90dG9tJyBwdXNoZXMgdGhlIHJvb3QgaW5s aW5lIGJveCdzIGJhc2VsaW5lIGRvd24gYXMgaXQgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBkb3du d2FyZHMuCisgICAgICAgIEluIG1vc3QgY2FzZXMgdGhpcyBtYWtlcyB0aGUgcm9vdCBpbmxpbmUg Ym94IHNpdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBsaW5lIGJveCBlLmcuCisgICAgICAgICAgPGRp dj4KKyAgICAgICAgICAgIHNvbWUgdGV4dAorICAgICAgICAgICAgPGltZyBzdHlsZT0idmVydGlj YWwtYWxpZ246IGJvdHRvbTsgaGVpZ2h0OiAxMDBweDsgd2lkdGg6IDEwcHg7Ij4KKyAgICAgICAg ICA8L2Rpdj4KKyAgICAgICAgICBmb3JtcyBhIDEwMHB4IHRhbGwgYmxvY2sgYm94IHdoZXJlIHRo ZSAic29tZSB0ZXh0IiBzaXRzIGF0IHRoZSBib3R0b20gb2YgdGhlIGxpbmUgYW5kIHRoZSB0YWxs IGltYWdlIGZpbGxzIHRoZSByZXN0IG9mIHRoZSBsaW5lIGJveCBhbGwgdGhlIHdheSB0byB0aGUg dG9wLgorICAKKyAgICAgICAgICBOb3cgaWYgd2UgYWRkIGFub3RoZXIgaW5saW5lIGxldmVsIGJv eCB3aXRoIGUuZy4gbWlkZGxlIGFsaWdubWVudC4gIAorICAgICAgICAgIDxkaXY+CisgICAgICAg ICAgICBzb21lIHRleHQKKyAgICAgICAgICAgIDxpbWcgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBt aWRkbGU7IGhlaWdodDogODBweDsgd2lkdGg6IDEwcHg7Ij4KKyAgICAgICAgICAgIDxpbWcgc3R5 bGU9InZlcnRpY2FsLWFsaWduOiBib3R0b207IGhlaWdodDogMTAwcHg7IHdpZHRoOiAxMHB4OyI+ CisgICAgICAgICAgPC9kaXY+CisgICAgICAgICAgV2Ugc3RpbGwgZm9ybSBhIDEwMHB4IHRhbGwg YmxvY2sgYm94IHdoZXJlIHRoZSAic29tZSB0ZXh0IiBjb250ZW50IHNpdHMgYXQgdGhlIGJvdHRv bSBhbmQgdGhlIG1pZGRsZSBhbGlnbmVkIGJveCBzdGljayBvdXQgb2YgdGhlIGJsb2NrIGJveCBi eSBhYm91dCA0MHB4IChtaWRkbGUgYWxpZ25tZW50IC0+IDgwcHgvMikgYXMgaXQgaXMgYWxpZ25l ZCBiYXNlZAorICAgICAgICAgIG9uIHRoZSByb290IGlubGluZSBib3gncyBwb3NpdGlvbiAod2hp Y2ggaXMgYXQgdGhlIHZlcnkgYm90dG9tIG9mIHRoZSBibG9jayBjb250YWluZXIpLgorICAgICAg ICAgIEluc3RlYWQgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHNob3VsZCBiZSBwdWxs IHVwIHRvIG1ha2Ugcm9vbSBmb3IgdGhlIG1pZGRsZSBhbGlnbmVkIGltYWdlIGJveC4KKworICAg ICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgaW5jb3JyZWN0IGJlaGF2aW9yIGJ5IHJlbW92aW5n IHRoZSBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbm1lbnQgdHlwZXMgZnJvbSB0aGUgcmVndWxhciBh bGlnbm1lbnQgbG9naWMgYW5kIG9mZnNldHRpbmcgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2Vs aW5lIHBvc2l0aW9uIGF0IGEgbGF0ZXIgc3RlcC4KKyAgICAgICAgV2hhdCB3ZSBkbyBoZXJlIGlz IHdlIHNpbXBseSBjb21wdXRlIHRoZSByb290IGlubGluZSBib3gncyBiYXNlbGluZSBwb3NpdGlv biBhcyBpZiB0aGVyZSB3ZXJlIG5vIGxpbmUgYm94IHJlbGF0aXZlIGFsaWduZWQgYm94ZXMgcHJl c2VudCBhbmQgb2Zmc2V0IHRoZSBmaW5hbCByZXN1bHQgaWYgc3VjaCBib3ggaGFwcGVucyB0byBz dHJldGNoIHRoZSBsaW5lIGJveC4KKyAgICAgICAgKGdvaW5nIGJhY2sgdG8gdGhlIGV4YW1wbGU6 IHdpdGhvdXQgdGhlIHRhbGwsIGJvdHRvbSBhbGlnbmVkIGltYWdlIGJveCwgd2UgY29tcHV0ZSB0 aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgcG9zaXRpb24gdG8gYmUgYXJvdW5kIDQwcHgg dG8KKyAgICAgICAgZW5zdXJlIHRoYXQgdGhlIDgwcHggaW1hZ2UgYm94IGZpdHMgYW5kIGxhdGVy IHdlIHB1c2ggaXQgZG93biB0byA2MHB4IChhcyB0aGUgMTAwcHggaW1hZ2UgYm94IHN0cmV0Y2hl cyB0aGUgbGluZSBib3ggYnkgMjBweCkuKQorCisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL3Zl cnRpY2FsLWFsaWduLWJvdHRvbS5odG1sCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHRBbmRBbGlnbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hW ZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVSb290 SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5oOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94VmVydGljYWxBbGlnbmVyOjpMaW5lQm94SGVp Z2h0Ojp2YWx1ZSBjb25zdCk6CisKIDIwMjItMDItMTUgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gRGVjb3VwbGUgbGluZSBib3ggcmVsYXRpdmUg YWxpZ25tZW50IHR5cGVzIHdoZW4gY29tcHV0aW5nIHRoZSByb290IGlubGluZSBib3gncyBiYXNl bGluZSBwb3NpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 VmVydGljYWxBbGlnbmVyLmNwcAppbmRleCA4MjFhOGJhNzlhOTQ3OTkzODM3MjNhMzBmMDY2Yjg5 N2Q3YzNkYTRiLi40NzcyNTQ3ZGM1ZDQ5Zjk5MGJmMDVjYjdmYmVkNWNlYmU3MmI0Y2Y2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVy LmNwcApAQCAtODMsOSArODMsOSBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFs aWduZXI6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0QW5kQWxpZ24oTGluZUJveCYgbAogICAgIC8vIDMu IEZpbmFsbHkgYWxpZ24gdGhlIGlubGluZSBsZXZlbCBib3hlcyB1c2luZyAobW9zdGx5KSBub3Jt YWwgaW5saW5lIGxldmVsIGJveCBnZW9tZXRyaWVzLgogICAgIEFTU0VSVChsaW5lQm94Lmhhc0Nv bnRlbnQoKSk7CiAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNvbXB1dGVMaW5lQm94 TG9naWNhbEhlaWdodChsaW5lQm94KTsKLSAgICBjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2Fs UG9zaXRpb24obGluZUJveCk7Ci0gICAgYWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIGxp bmVCb3hMb2dpY2FsSGVpZ2h0KTsKLSAgICByZXR1cm4gbGluZUJveExvZ2ljYWxIZWlnaHQ7Cisg ICAgY29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKGxpbmVCb3gsIGxpbmVCb3hM b2dpY2FsSGVpZ2h0KTsKKyAgICBhbGlnbklubGluZUxldmVsQm94ZXMobGluZUJveCwgbGluZUJv eExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CisgICAgcmV0dXJuIGxpbmVCb3hMb2dpY2FsSGVpZ2h0 LnZhbHVlKCk7CiB9CiAKIElubGluZUxheW91dFVuaXQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6 c2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0CkBAIC0x MTcsNyArMTE3LDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpz aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQoTGluZUJveCYgbGkKICAgICByZXR1cm4gbGluZUJv eExvZ2ljYWxCb3R0b20gLSBsaW5lQm94TG9naWNhbFRvcDsKIH0KIAotSW5saW5lTGF5b3V0VW5p dCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlTGluZUJveExvZ2ljYWxIZWlnaHQoTGlu ZUJveCYgbGluZUJveCkgY29uc3QKK0xpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OkxpbmVCb3hIZWln aHQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVpZ2h0KExp bmVCb3gmIGxpbmVCb3gpIGNvbnN0CiB7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiAocGFydGlhbGx5 KSBpbXBsZW1lbnRzOgogICAgIC8vIDIuMi4gTGF5b3V0IFdpdGhpbiBMaW5lIEJveGVzCkBAIC0y MTcsMTYgKzIxNywyNyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6 OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94JiBsaQogICAgIC8vIFRoZSBsaW5l IGJveCBoZWlnaHQgY29tcHV0YXRpb24gaXMgYXMgZm9sbG93czoKICAgICAvLyAxLiBTdHJldGNo IHRoZSBsaW5lIGJveCB3aXRoIHRoZSBub24tbGluZS1ib3ggcmVsYXRpdmUgYWxpZ25lZCBpbmxp bmUgYm94IGFic29sdXRlIHRvcCBhbmQgYm90dG9tIHZhbHVlcy4KICAgICAvLyAyLiBDaGVjayBp ZiB0aGUgbGluZSBib3ggcmVsYXRpdmUgYWxpZ25lZCBpbmxpbmUgYm94ZXMgKHRvcCwgYm90dG9t IGV0YykgaGF2ZSBlbm91Z2ggcm9vbSBhbmQgc3RyZXRjaCB0aGUgbGluZSBib3ggZnVydGhlciBp ZiBuZWVkZWQuCi0gICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IHZhbHVlT3JEZWZhdWx0 KG1heGltdW1Mb2dpY2FsQm90dG9tKSAtIHZhbHVlT3JEZWZhdWx0KG1pbmltdW1Mb2dpY2FsVG9w KTsKKyAgICBhdXRvIG5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQgPSB2YWx1ZU9y RGVmYXVsdChtYXhpbXVtTG9naWNhbEJvdHRvbSkgLSB2YWx1ZU9yRGVmYXVsdChtaW5pbXVtTG9n aWNhbFRvcCk7CisgICAgYXV0byBib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0ID0gc3Rk OjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7IH07CiAgICAgZm9yIChhdXRvKiBsaW5lQm94 UmVsYXRpdmVJbmxpbmVMZXZlbEJveCA6IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94ZXMp IHsKICAgICAgICAgaWYgKCFmb3JtYXR0aW5nR2VvbWV0cnkuaW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveCgqbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpKQogICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgo bGluZUJveExvZ2ljYWxIZWlnaHQsIGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94LT5sYXlv dXRCb3VuZHMoKS5oZWlnaHQoKSk7CisgICAgICAgIC8vIFRoaXMgbGluZSBib3ggcmVsYXRpdmUg YWxpZ25lZCBpbmxpbmUgbGV2ZWwgYm94IHN0cmV0Y2hlcyB0aGUgbGluZSBib3guCisgICAgICAg IGF1dG8gaW5saW5lTGV2ZWxCb3hIZWlnaHQgPSBsaW5lQm94UmVsYXRpdmVJbmxpbmVMZXZlbEJv eC0+bGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCk7CisgICAgICAgIGlmIChsaW5lQm94UmVsYXRpdmVJ bmxpbmVMZXZlbEJveC0+dmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6VG9w KSB7CisgICAgICAgICAgICBub25Cb3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0ID0gc3Rk OjptYXgoaW5saW5lTGV2ZWxCb3hIZWlnaHQsIG5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1I ZWlnaHQpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGxp bmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94LT52ZXJ0aWNhbEFsaWduKCkudHlwZSA9PSBWZXJ0 aWNhbEFsaWduOjpCb3R0b20pIHsKKyAgICAgICAgICAgIGJvdHRvbUFsaWduZWRCb3hlc01heGlt dW1IZWlnaHQgPSBzdGQ6Om1heChpbmxpbmVMZXZlbEJveEhlaWdodCwgYm90dG9tQWxpZ25lZEJv eGVzTWF4aW11bUhlaWdodC52YWx1ZV9vcigwLmYpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICB9CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KLSAgICByZXR1 cm4gbGluZUJveExvZ2ljYWxIZWlnaHQ7CisgICAgcmV0dXJuIHsgbm9uQm90dG9tQWxpZ25lZEJv eGVzTWF4aW11bUhlaWdodCwgYm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCB9OwogfQog Ci12b2lkIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JiBsaW5lQm94KSBjb25zdAordm9pZCBMaW5lQm94VmVydGljYWxB bGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZUJveEhlaWdodCYgbGluZUJveEhlaWdodCkgY29uc3QKIHsKICAgICBh dXRvJiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7CiAgICAgYXV0byYg Zm9ybWF0dGluZ0dlb21ldHJ5ID0gdGhpcy0+Zm9ybWF0dGluZ0dlb21ldHJ5KCk7CkBAIC0yNDQs MTggKzI1NSw5IEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxp bmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVCCiAgICAgICAgIGF1dG8mIGlubGlu ZUxldmVsQm94ID0gbm9uUm9vdElubGluZUxldmVsQm94ZXNbaW5kZXhdOwogICAgICAgICBhdXRv IHZlcnRpY2FsQWxpZ24gPSBpbmxpbmVMZXZlbEJveC52ZXJ0aWNhbEFsaWduKCk7CiAKLSAgICAg ICAgYXV0byBhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBbJl0gewotICAg ICAgICAgICAgaWYgKHZlcnRpY2FsQWxpZ24udHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpUb3ApIHsK LSAgICAgICAgICAgICAgICAvLyB2ZXJ0aWNhbC1hbGlnbjogdG9wIGlzIGEgbGluZSBib3ggcmVs YXRpdmUgYWxpZ25tZW50LiBJdCBzdHJldGNoZXMgdGhlIGxpbmUgYm94IGRvd253YXJkcyBtZWFu aW5nIHRoYXQgaXQgZG9lcyBub3QgYWZmZWN0IHRoZSByb290IGlubGluZSBib3gncyBiYXNlbGlu ZSBwb3NpdGlvbi4KLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgICAgICBhdXRvIGlubGluZUxldmVsQm94U3RyZWNoZXNMaW5lQm94ID0gZm9ybWF0 dGluZ0dlb21ldHJ5LmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goaW5saW5lTGV2ZWxCb3gs IGxpbmVCb3gpOwotICAgICAgICAgICAgcmV0dXJuIGlubGluZUxldmVsQm94U3RyZWNoZXNMaW5l Qm94IHx8IChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkgJiYgaW5saW5l TGV2ZWxCb3guYXNjZW50KCkpOwotICAgICAgICB9OwotCiAgICAgICAgIGlmIChpbmxpbmVMZXZl bEJveC5oYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgewotICAgICAgICAgICAgaWYgKGFm ZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbigpKQotICAgICAgICAgICAgICAgIGlu bGluZUxldmVsQm94SW5kZXhlc1dpdGhCb3R0b21BbGlnbm1lbnQuYXBwZW5kKGluZGV4KTsKKyAg ICAgICAgICAgIC8vIHZlcnRpY2FsLWFsaWduOiB0b3AgZG9lcyBub3QgYWZmZWN0IHRoZSByb290 IGlubGluZSBib3gncyBiYXNlbGluZSBwb3NpdGlvbiAoaXQgc3RyZXRjaGVzIHRoZSBsaW5lIGJv eCdzIGJvdHRvbSkgYW5kCisgICAgICAgICAgICAvLyB2ZXJ0aWNhbC1hbGlnbjogYm90dG9tIGlt cG9zZXMgYSBzaW1wbGUgb2Zmc2V0IChzZWUgKS4KICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICB9CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94LmxheW91dEJv eCgpOwpAQCAtMzAwLDcgKzMwMiwxMSBAQCB2b2lkIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNv bXB1dGVSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihMaW5lQm94JiBsaW5lQgogICAgICAg ICBhdXRvIGFic29sdXRlQmFzZWxpbmVPZmZzZXQgPSBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFz ZWxpbmVPZmZzZXRNYXAuZ2V0KCZwYXJlbnRJbmxpbmVCb3gpICsgYmFzZWxpbmVPZmZzZXRGcm9t UGFyZW50QmFzZWxpbmU7CiAgICAgICAgIGlubGluZUxldmVsQm94QWJzb2x1dGVCYXNlbGluZU9m ZnNldE1hcC5hZGQoJmlubGluZUxldmVsQm94LCBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0KTsKIAot ICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKCkpIHsKKyAg ICAgICAgYXV0byBhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBbJl0gewor ICAgICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGluZUJveCA9IGZvcm1hdHRp bmdHZW9tZXRyeS5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGlubGluZUxldmVsQm94LCBs aW5lQm94KTsKKyAgICAgICAgICAgIHJldHVybiBpbmxpbmVMZXZlbEJveFN0cmVjaGVzTGluZUJv eCB8fCAoaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpICYmIGlubGluZUxl dmVsQm94LmFzY2VudCgpKTsKKyAgICAgICAgfSgpOworICAgICAgICBpZiAoYWZmZWN0c1Jvb3RJ bmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKSB7CiAgICAgICAgICAgICBhdXRvIHRvcE9mZnNldEZy b21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0ICsgaW5saW5l TGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwogICAgICAgICAgICAgaWYgKG1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lKQogICAgICAgICAgICAgICAgIG1heGlt dW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gc3RkOjptYXgoKm1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLCB0b3BPZmZzZXRGcm9tUm9vdElubGlu ZUJveEJhc2VsaW5lKTsKQEAgLTMxNCwxNiArMzIwLDkgQEAgdm9pZCBMaW5lQm94VmVydGljYWxB bGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGlu ZUIKICAgICAgICAgfQogICAgIH0KIAotICAgIGZvciAoYXV0byBpbmRleCA6IGlubGluZUxldmVs Qm94SW5kZXhlc1dpdGhCb3R0b21BbGlnbm1lbnQpIHsKLSAgICAgICAgYXV0byYgYm90dG9tQWxp Z25lZElubGluZUxldmVsQm94ID0gbm9uUm9vdElubGluZUxldmVsQm94ZXNbaW5kZXhdOwotICAg ICAgICBhdXRvIHZlcnRpY2FsQWxpZ24gPSBib3R0b21BbGlnbmVkSW5saW5lTGV2ZWxCb3gudmVy dGljYWxBbGlnbigpLnR5cGU7Ci0gICAgICAgIEFTU0VSVCh2ZXJ0aWNhbEFsaWduID09IFZlcnRp Y2FsQWxpZ246OkJvdHRvbSk7Ci0KLSAgICAgICAgYXV0byBiYXNlbGluZU9mZnNldCA9IGJvdHRv bUFsaWduZWRJbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50IC0gcm9vdElubGlu ZUJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50OwotICAgICAgICBhdXRvIHRvcE9mZnNldEZyb21S b290SW5saW5lQm94QmFzZWxpbmUgPSBiYXNlbGluZU9mZnNldCArIGJvdHRvbUFsaWduZWRJbmxp bmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7Ci0gICAgICAgIG1heGltdW1Ub3BPZmZz ZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gc3RkOjptYXgoKm1heGltdW1Ub3BPZmZzZXRG cm9tUm9vdElubGluZUJveEJhc2VsaW5lLCB0b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2Vs aW5lKTsKLSAgICB9Ci0gICAgYXV0byByb290SW5saW5lQm94TG9naWNhbFRvcCA9IG1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlX29yKDAuZikgLSByb290SW5s aW5lQm94LmFzY2VudCgpOworICAgIC8vIHZlcnRpY2FsLWFsaWduOiBib3R0b20gc3RyZXRjaGVz IHRoZSB0b3Agb2YgdGhlIGxpbmUgYm94IHB1c2hpbmcgdGhlIHJvb3QgaW5saW5lIGJveCBkb3du d2FyZHMuCisgICAgYXV0byBib3R0b21BbGlnbmVkQm94U3RyZXRjaCA9IHN0ZDo6bWF4KDAuZiwg bGluZUJveEhlaWdodC5ib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0LnZhbHVlX29yKDAu ZikgLSBsaW5lQm94SGVpZ2h0Lm5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQpOwor ICAgIGF1dG8gcm9vdElubGluZUJveExvZ2ljYWxUb3AgPSBib3R0b21BbGlnbmVkQm94U3RyZXRj aCArIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlX29yKDAu ZikgLSByb290SW5saW5lQm94LmFzY2VudCgpOwogICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNh bFRvcChyb290SW5saW5lQm94TG9naWNhbFRvcCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0 aWNhbEFsaWduZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuaAppbmRleCBhODJiNDZmNjk2MmY5 ZDU0MTY0OTM5ODg4MzJhODA2ZDc3YmEyOTI5Li40N2U0NTNhY2QyYTE0ODQxNzMwZmI2M2VmZTc5 MWRkMjFjNzZiOGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eFZlcnRpY2FsQWxpZ25lci5oCkBAIC00MSw4ICs0MSwxNCBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIElubGluZUxheW91dFVuaXQgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KExpbmVCb3gm KSBjb25zdDsKIAotICAgIElubGluZUxheW91dFVuaXQgY29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVp Z2h0KExpbmVCb3gmKSBjb25zdDsKLSAgICB2b2lkIGNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JikgY29uc3Q7CisgICAgc3RydWN0IExpbmVCb3hIZWlnaHQgewor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHZhbHVlKCkgY29uc3QgeyByZXR1cm4gc3RkOjptYXgo bm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCwgYm90dG9tQWxpZ25lZEJveGVzTWF4 aW11bUhlaWdodC52YWx1ZV9vcigwLmYpKTsgfQorCisgICAgICAgIElubGluZUxheW91dFVuaXQg bm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCB7IDAgfTsKKyAgICAgICAgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0 IHsgfTsKKyAgICB9OworICAgIExpbmVCb3hIZWlnaHQgY29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVp Z2h0KExpbmVCb3gmKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JiwgY29uc3QgTGluZUJveEhlaWdodCYpIGNvbnN0OwogICAgIHZv aWQgYWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVC b3hMb2dpY2FsSGVpZ2h0KSBjb25zdDsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdHZW9t ZXRyeSYgZm9ybWF0dGluZ0dlb21ldHJ5KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0 aW5nR2VvbWV0cnk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0ODYyYTEyZWE2YmNlNWI5YWJlYWVkNjRjNDAzNjA0ZTUx Mjg3MmNlLi4wYjM0YzAyOGUyNjViZTc0NjdjZDYxYzI0OWM4N2Y1ODE3MWE0NzZhIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMTUgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgorCisgICAgICAgIFtMRkNdW0lGQ10gJ3ZlcnRpY2FsLWFsaWduOiBib3R0b20nIG1ha2VzIGlu bGluZSBsZXZlbCBib3hlcyBzdGljayBvdXQgb2YgdGhlaXIgcGFyZW50IGJsb2NrIGJveAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2Njc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2lubGlu ZS92ZXJ0aWNhbC1hbGlnbi1ib3R0b20tZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog ZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9tLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAy LTE0ICBGcsOpZMOpcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE51bGxw dHIgY3Jhc2ggaW4gQ29tcG9zaXRlRWRpdENvbW1hbmQ6OnNwbGl0VHJlZVRvTm9kZSB2aWEgSW5z ZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZDo6ZG9BcHBseQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9tLWV4cGVjdGVkLmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0aWNhbC1hbGlnbi1ib3R0b20tZXhwZWN0ZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5hNGVlM2MxNTQxZjA2NjhmMWFhYzBlNTYyYTJiMDhlNDg0ZWMzOWVmCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24t Ym90dG9tLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8 c3R5bGU+CitkaXYgeworICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICB3aWR0aDogMTIw cHg7CisgICBtYXJnaW4tYm90dG9tOiAyMHB4OworfQorCis8L3N0eWxlPgorPGRpdiBzdHlsZT0i aGVpZ2h0OiA1MHB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyI+PC9kaXY+ Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDIwMHB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6 IDUwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsiPjwvZGl2PgorPGRpdiBz dHlsZT0iaGVpZ2h0OiA1MHB4OyI+PC9kaXY+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9t Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0aWNhbC1hbGlnbi1ib3R0b20uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi41Mzc0ODc4ZWUwNmZhNTBkMGM0MDQ4ZGQxZjdjYzEwMWFjMzAxZTk1Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24t Ym90dG9tLmh0bWwKQEAgLTAsMCArMSw0MSBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+Cisu YmxvY2sgeworICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICB3aWR0aDogMTIwcHg7Cisg ICBtYXJnaW4tYm90dG9tOiAyMHB4OworICAgY29sb3I6IHRyYW5zcGFyZW50OworICAgZm9udC1m YW1pbHk6IEFoZW07CisgICBmb250LXNpemU6IDIwcHg7Cit9CisKKy5hbGlnbmVkLWJveCB7Cisg IGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgIHdp ZHRoOiA1MHB4OworICBoZWlnaHQ6IDUwcHg7CisKK30KKy5ub24tbGluZUJveC1yZWxhdGl2ZSB7 CisgICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7CisgICB3aWR0aDogNTBweDsKKyAgIGhlaWdo dDogMjBweDsKK30KKy5ib3R0b20geworICB2ZXJ0aWNhbC1hbGlnbjogYm90dG9tOworCisgIHdp ZHRoOiA1MHB4OworICBoZWlnaHQ6IDUwcHg7Cit9CisudG9wIHsKKyAgdmVydGljYWwtYWxpZ246 IHRvcDsKKworfQorPC9zdHlsZT4KKzwhLS0gVGhlIG5vbi1saW5lLWJveCByZWxhdGl2ZSBpbmxp bmUgbGV2ZWwgYm94ZXMgc2hvdWxkIG5vdCBzdGljayBvdXQgb2YgdGhlaXIgcGFyZW50IGJsb2Nr IGJveCAtLT4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWduZWQtYm94IG5vbi1s aW5lQm94LXJlbGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggYm90dG9tIj48 L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWduZWQtYm94IG5v bi1saW5lQm94LXJlbGF0aXZlIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsiPlg8L2Rpdj48ZGl2IGNs YXNzPSJhbGlnbmVkLWJveCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1ibG9jaz5Y PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiIHN0eWxlPSJwYWRk aW5nLWJvdHRvbTogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij5YPC9kaXY+PGRpdiBjbGFzcz0iYWxp Z25lZC1ib3ggYm90dG9tIj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xh c3M9ImFsaWduZWQtYm94IG5vbi1saW5lQm94LXJlbGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0i YWxpZ25lZC1ib3ggYm90dG9tIj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYg Y2xhc3M9ImFsaWduZWQtYm94IG5vbi1saW5lQm94LXJlbGF0aXZlIiBzdHlsZT0iaGVpZ2h0OiAz MHB4OyB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1i b3ggYm90dG9tIj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFs aWduZWQtYm94IG5vbi1saW5lQm94LXJlbGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25l ZC1ib3ggdG9wIj48L2Rpdj48L2Rpdj4K 452307 2022-02-16 21:15:10 -0800 2022-02-17 08:28:16 -0800 Patch bug-236677-20220216211509.patch text/plain 15425 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA5NTBmZjIxNjgxYjkx OTE0YTE1NTc3YzMxYWM2YmI5NGE5MTdhYS4uYjM2ZmE0NGQwN2Y3NmNmYTcyMDk3OTA1MWRmNDk1 NWIxYWYwNDExZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTAyLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdICd2ZXJ0aWNh bC1hbGlnbjogYm90dG9tJyBtYWtlcyBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRo ZWlyIHBhcmVudCBibG9jayBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjY3NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgorCisgICAgICAgICd2ZXJ0aWNhbC1hbGlnbjogYm90dG9tJyBwdXNoZXMgdGhlIHJvb3QgaW5s aW5lIGJveCdzIGJhc2VsaW5lIGRvd24gYXMgaXQgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBkb3du d2FyZHMuCisgICAgICAgIEluIG1vc3QgY2FzZXMgdGhpcyBtYWtlcyB0aGUgcm9vdCBpbmxpbmUg Ym94IHNpdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBsaW5lIGJveCBlLmcuCisgICAgICAgICAgPGRp dj4KKyAgICAgICAgICAgIHNvbWUgdGV4dAorICAgICAgICAgICAgPGltZyBzdHlsZT0idmVydGlj YWwtYWxpZ246IGJvdHRvbTsgaGVpZ2h0OiAxMDBweDsgd2lkdGg6IDEwcHg7Ij4KKyAgICAgICAg ICA8L2Rpdj4KKyAgICAgICAgICBmb3JtcyBhIDEwMHB4IHRhbGwgYmxvY2sgYm94IHdoZXJlIHRo ZSAic29tZSB0ZXh0IiBzaXRzIGF0IHRoZSBib3R0b20gb2YgdGhlIGxpbmUgYW5kIHRoZSB0YWxs IGltYWdlIGZpbGxzIHRoZSByZXN0IG9mIHRoZSBsaW5lIGJveCBhbGwgdGhlIHdheSB0byB0aGUg dG9wLgorICAKKyAgICAgICAgICBOb3cgaWYgd2UgYWRkIGFub3RoZXIgaW5saW5lIGxldmVsIGJv eCB3aXRoIGUuZy4gbWlkZGxlIGFsaWdubWVudC4gIAorICAgICAgICAgIDxkaXY+CisgICAgICAg ICAgICBzb21lIHRleHQKKyAgICAgICAgICAgIDxpbWcgc3R5bGU9InZlcnRpY2FsLWFsaWduOiBt aWRkbGU7IGhlaWdodDogODBweDsgd2lkdGg6IDEwcHg7Ij4KKyAgICAgICAgICAgIDxpbWcgc3R5 bGU9InZlcnRpY2FsLWFsaWduOiBib3R0b207IGhlaWdodDogMTAwcHg7IHdpZHRoOiAxMHB4OyI+ CisgICAgICAgICAgPC9kaXY+CisgICAgICAgICAgV2Ugc3RpbGwgZm9ybSBhIDEwMHB4IHRhbGwg YmxvY2sgYm94IHdoZXJlIHRoZSAic29tZSB0ZXh0IiBjb250ZW50IHNpdHMgYXQgdGhlIGJvdHRv bSBhbmQgdGhlIG1pZGRsZSBhbGlnbmVkIGJveCBzdGljayBvdXQgb2YgdGhlIGJsb2NrIGJveCBi eSBhYm91dCA0MHB4IChtaWRkbGUgYWxpZ25tZW50IC0+IDgwcHgvMikgYXMgaXQgaXMgYWxpZ25l ZCBiYXNlZAorICAgICAgICAgIG9uIHRoZSByb290IGlubGluZSBib3gncyBwb3NpdGlvbiAod2hp Y2ggaXMgYXQgdGhlIHZlcnkgYm90dG9tIG9mIHRoZSBibG9jayBjb250YWluZXIpLgorICAgICAg ICAgIEluc3RlYWQgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHNob3VsZCBiZSBwdWxs IHVwIHRvIG1ha2Ugcm9vbSBmb3IgdGhlIG1pZGRsZSBhbGlnbmVkIGltYWdlIGJveC4KKworICAg ICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgaW5jb3JyZWN0IGJlaGF2aW9yIGJ5IHJlbW92aW5n IHRoZSBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbm1lbnQgdHlwZXMgZnJvbSB0aGUgcmVndWxhciBh bGlnbm1lbnQgbG9naWMgYW5kIG9mZnNldHRpbmcgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2Vs aW5lIHBvc2l0aW9uIGF0IGEgbGF0ZXIgc3RlcC4KKyAgICAgICAgV2hhdCB3ZSBkbyBoZXJlIGlz IHdlIHNpbXBseSBjb21wdXRlIHRoZSByb290IGlubGluZSBib3gncyBiYXNlbGluZSBwb3NpdGlv biBhcyBpZiB0aGVyZSB3ZXJlIG5vIGxpbmUgYm94IHJlbGF0aXZlIGFsaWduZWQgYm94ZXMgcHJl c2VudCBhbmQgb2Zmc2V0IHRoZSBmaW5hbCByZXN1bHQgaWYgc3VjaCBib3ggaGFwcGVucyB0byBz dHJldGNoIHRoZSBsaW5lIGJveC4KKyAgICAgICAgKGdvaW5nIGJhY2sgdG8gdGhlIGV4YW1wbGU6 IHdpdGhvdXQgdGhlIHRhbGwsIGJvdHRvbSBhbGlnbmVkIGltYWdlIGJveCwgd2UgY29tcHV0ZSB0 aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgcG9zaXRpb24gdG8gYmUgYXJvdW5kIDQwcHgg dG8KKyAgICAgICAgZW5zdXJlIHRoYXQgdGhlIDgwcHggaW1hZ2UgYm94IGZpdHMgYW5kIGxhdGVy IHdlIHB1c2ggaXQgZG93biB0byA2MHB4IChhcyB0aGUgMTAwcHggaW1hZ2UgYm94IHN0cmV0Y2hl cyB0aGUgbGluZSBib3ggYnkgMjBweCkuKQorCisgICAgICAgIFRlc3Q6IGZhc3QvaW5saW5lL3Zl cnRpY2FsLWFsaWduLWJvdHRvbS5odG1sCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHRBbmRBbGlnbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hW ZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVSb290 SW5saW5lQm94VmVydGljYWxQb3NpdGlvbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5oOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94VmVydGljYWxBbGlnbmVyOjpMaW5lQm94SGVp Z2h0Ojp2YWx1ZSBjb25zdCk6CisKIDIwMjItMDItMTUgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gRGVjb3VwbGUgbGluZSBib3ggcmVsYXRpdmUg YWxpZ25tZW50IHR5cGVzIHdoZW4gY29tcHV0aW5nIHRoZSByb290IGlubGluZSBib3gncyBiYXNl bGluZSBwb3NpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 VmVydGljYWxBbGlnbmVyLmNwcAppbmRleCA0MmMyNTRhNzRjZWJmOGY5ZWUwMzMwOWM4ZWYyN2Ni YmQ5Mjk2MWU3Li4zMTdiZDFhNjE5YTRlYTEzZmY3ZDFlZDVkOGNhMGQyNWIxN2M0YjBlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVy LmNwcApAQCAtODMsOSArODMsOSBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFs aWduZXI6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0QW5kQWxpZ24oTGluZUJveCYgbAogICAgIC8vIDMu IEZpbmFsbHkgYWxpZ24gdGhlIGlubGluZSBsZXZlbCBib3hlcyB1c2luZyAobW9zdGx5KSBub3Jt YWwgaW5saW5lIGxldmVsIGJveCBnZW9tZXRyaWVzLgogICAgIEFTU0VSVChsaW5lQm94Lmhhc0Nv bnRlbnQoKSk7CiAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNvbXB1dGVMaW5lQm94 TG9naWNhbEhlaWdodChsaW5lQm94KTsKLSAgICBjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2Fs UG9zaXRpb24obGluZUJveCk7Ci0gICAgYWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIGxp bmVCb3hMb2dpY2FsSGVpZ2h0KTsKLSAgICByZXR1cm4gbGluZUJveExvZ2ljYWxIZWlnaHQ7Cisg ICAgY29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKGxpbmVCb3gsIGxpbmVCb3hM b2dpY2FsSGVpZ2h0KTsKKyAgICBhbGlnbklubGluZUxldmVsQm94ZXMobGluZUJveCwgbGluZUJv eExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CisgICAgcmV0dXJuIGxpbmVCb3hMb2dpY2FsSGVpZ2h0 LnZhbHVlKCk7CiB9CiAKIElubGluZUxheW91dFVuaXQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6 c2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0CkBAIC0x MTcsNyArMTE3LDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpz aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQoTGluZUJveCYgbGkKICAgICByZXR1cm4gbGluZUJv eExvZ2ljYWxCb3R0b20gLSBsaW5lQm94TG9naWNhbFRvcDsKIH0KIAotSW5saW5lTGF5b3V0VW5p dCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlTGluZUJveExvZ2ljYWxIZWlnaHQoTGlu ZUJveCYgbGluZUJveCkgY29uc3QKK0xpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OkxpbmVCb3hIZWln aHQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVpZ2h0KExp bmVCb3gmIGxpbmVCb3gpIGNvbnN0CiB7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiAocGFydGlhbGx5 KSBpbXBsZW1lbnRzOgogICAgIC8vIDIuMi4gTGF5b3V0IFdpdGhpbiBMaW5lIEJveGVzCkBAIC0y MTcsMjAgKzIxNywzMSBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6 OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94JiBsaQogICAgIC8vIFRoZSBsaW5l IGJveCBoZWlnaHQgY29tcHV0YXRpb24gaXMgYXMgZm9sbG93czoKICAgICAvLyAxLiBTdHJldGNo IHRoZSBsaW5lIGJveCB3aXRoIHRoZSBub24tbGluZS1ib3ggcmVsYXRpdmUgYWxpZ25lZCBpbmxp bmUgYm94IGFic29sdXRlIHRvcCBhbmQgYm90dG9tIHZhbHVlcy4KICAgICAvLyAyLiBDaGVjayBp ZiB0aGUgbGluZSBib3ggcmVsYXRpdmUgYWxpZ25lZCBpbmxpbmUgYm94ZXMgKHRvcCwgYm90dG9t IGV0YykgaGF2ZSBlbm91Z2ggcm9vbSBhbmQgc3RyZXRjaCB0aGUgbGluZSBib3ggZnVydGhlciBp ZiBuZWVkZWQuCi0gICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IHZhbHVlT3JEZWZhdWx0 KG1heGltdW1Mb2dpY2FsQm90dG9tKSAtIHZhbHVlT3JEZWZhdWx0KG1pbmltdW1Mb2dpY2FsVG9w KTsKKyAgICBhdXRvIG5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQgPSB2YWx1ZU9y RGVmYXVsdChtYXhpbXVtTG9naWNhbEJvdHRvbSkgLSB2YWx1ZU9yRGVmYXVsdChtaW5pbXVtTG9n aWNhbFRvcCk7CisgICAgYXV0byBib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0ID0gc3Rk OjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7IH07CiAgICAgZm9yIChhdXRvKiBsaW5lQm94 UmVsYXRpdmVJbmxpbmVMZXZlbEJveCA6IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94ZXMp IHsKICAgICAgICAgaWYgKCFmb3JtYXR0aW5nR2VvbWV0cnkuaW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveCgqbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gsIGxpbmVCb3gpKQogICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgo bGluZUJveExvZ2ljYWxIZWlnaHQsIGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94LT5sYXlv dXRCb3VuZHMoKS5oZWlnaHQoKSk7CisgICAgICAgIC8vIFRoaXMgbGluZSBib3ggcmVsYXRpdmUg YWxpZ25lZCBpbmxpbmUgbGV2ZWwgYm94IHN0cmV0Y2hlcyB0aGUgbGluZSBib3guCisgICAgICAg IGF1dG8gaW5saW5lTGV2ZWxCb3hIZWlnaHQgPSBsaW5lQm94UmVsYXRpdmVJbmxpbmVMZXZlbEJv eC0+bGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCk7CisgICAgICAgIGlmIChsaW5lQm94UmVsYXRpdmVJ bmxpbmVMZXZlbEJveC0+dmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6VG9w KSB7CisgICAgICAgICAgICBub25Cb3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0ID0gc3Rk OjptYXgoaW5saW5lTGV2ZWxCb3hIZWlnaHQsIG5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1I ZWlnaHQpOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGxp bmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94LT52ZXJ0aWNhbEFsaWduKCkudHlwZSA9PSBWZXJ0 aWNhbEFsaWduOjpCb3R0b20pIHsKKyAgICAgICAgICAgIGJvdHRvbUFsaWduZWRCb3hlc01heGlt dW1IZWlnaHQgPSBzdGQ6Om1heChpbmxpbmVMZXZlbEJveEhlaWdodCwgYm90dG9tQWxpZ25lZEJv eGVzTWF4aW11bUhlaWdodC52YWx1ZV9vcigwLmYpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICB9CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KLSAgICByZXR1 cm4gbGluZUJveExvZ2ljYWxIZWlnaHQ7CisgICAgcmV0dXJuIHsgbm9uQm90dG9tQWxpZ25lZEJv eGVzTWF4aW11bUhlaWdodCwgYm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCB9OwogfQog Ci12b2lkIExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JiBsaW5lQm94KSBjb25zdAordm9pZCBMaW5lQm94VmVydGljYWxB bGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZUJveEhlaWdodCYgbGluZUJveEhlaWdodCkgY29uc3QKIHsKICAgICBh dXRvJiByb290SW5saW5lQm94ID0gbGluZUJveC5yb290SW5saW5lQm94KCk7CiAgICAgYXV0byYg Zm9ybWF0dGluZ0dlb21ldHJ5ID0gdGhpcy0+Zm9ybWF0dGluZ0dlb21ldHJ5KCk7Ci0gICAgVmVj dG9yPHVuc2lnbmVkPiBpbmxpbmVMZXZlbEJveEluZGV4ZXNXaXRoTGluZUJveFJlbGF0aXZlQWxp Z25tZW50OworICAgIGF1dG8gaGFzVG9wQWxpZ25lZElubGluZUxldmVsQm94ID0gZmFsc2U7CiAK ICAgICBIYXNoTWFwPGNvbnN0IElubGluZUxldmVsQm94KiwgSW5saW5lTGF5b3V0VW5pdD4gaW5s aW5lTGV2ZWxCb3hBYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0TWFwOwogICAgIGlubGluZUxldmVsQm94 QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoJnJvb3RJbmxpbmVCb3gsIElubGluZUxheW91 dFVuaXQgeyB9KTsKQEAgLTI1MCwxMyArMjYxLDEzIEBAIHZvaWQgTGluZUJveFZlcnRpY2FsQWxp Z25lcjo6Y29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExpbmVCb3gmIGxpbmVC CiAgICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9IGlubGluZUxldmVsQm94LnZlcnRpY2FsQWxp Z24oKTsKIAogICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaGFzTGluZUJveFJlbGF0aXZlQWxp Z25tZW50KCkpIHsKLSAgICAgICAgICAgIGlmICh2ZXJ0aWNhbEFsaWduLnR5cGUgPT0gVmVydGlj YWxBbGlnbjo6VG9wKQorICAgICAgICAgICAgaWYgKHZlcnRpY2FsQWxpZ24udHlwZSA9PSBWZXJ0 aWNhbEFsaWduOjpUb3ApIHsKKyAgICAgICAgICAgICAgICBoYXNUb3BBbGlnbmVkSW5saW5lTGV2 ZWxCb3ggPSBoYXNUb3BBbGlnbmVkSW5saW5lTGV2ZWxCb3ggfHwgYWZmZWN0c1Jvb3RJbmxpbmVC b3hWZXJ0aWNhbFBvc2l0aW9uKGlubGluZUxldmVsQm94KTsKICAgICAgICAgICAgICAgICBpbmxp bmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXAuYWRkKCZpbmxpbmVMZXZlbEJveCwg cm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQgLSBpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3VuZHMoKS5hc2NlbnQpOwotICAgICAgICAgICAgZWxzZSBpZiAodmVydGljYWxBbGlnbi50 eXBlID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbSkKKyAgICAgICAgICAgIH0gZWxzZSBpZiAodmVy dGljYWxBbGlnbi50eXBlID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbSkKICAgICAgICAgICAgICAg ICBpbmxpbmVMZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXAuYWRkKCZpbmxpbmVMZXZl bEJveCwgaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCAtIHJvb3RJbmxpbmVC b3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBpbmxpbmVMZXZlbEJveElu ZGV4ZXNXaXRoTGluZUJveFJlbGF0aXZlQWxpZ25tZW50LmFwcGVuZChpbmRleCk7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxp bmVMZXZlbEJveC5sYXlvdXRCb3goKTsKQEAgLTMxNSwyNCArMzI2LDE0IEBAIHZvaWQgTGluZUJv eFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKExp bmVCb3gmIGxpbmVCCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBmb3IgKGF1dG8gaW5kZXggOiBp bmxpbmVMZXZlbEJveEluZGV4ZXNXaXRoTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KSB7Ci0gICAg ICAgIGF1dG8mIGlubGluZUxldmVsQm94ID0gbm9uUm9vdElubGluZUxldmVsQm94ZXNbaW5kZXhd OwotICAgICAgICBpZiAoIWFmZmVjdHNSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihpbmxp bmVMZXZlbEJveCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBpZiAoaW5saW5l TGV2ZWxCb3gudmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tKSB7 Ci0gICAgICAgICAgICBhdXRvIGJhc2VsaW5lT2Zmc2V0ID0gaW5saW5lTGV2ZWxCb3gubGF5b3V0 Qm91bmRzKCkuZGVzY2VudCAtIHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuZGVzY2VudDsK LSAgICAgICAgICAgIGF1dG8gdG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IGJh c2VsaW5lT2Zmc2V0ICsgaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwotICAg ICAgICAgICAgbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSBzdGQ6 Om1heCgqbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUsIHRvcE9mZnNl dEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUpOwotICAgICAgICB9IGVsc2UgaWYgKGlubGluZUxl dmVsQm94LnZlcnRpY2FsQWxpZ24oKS50eXBlID09IFZlcnRpY2FsQWxpZ246OlRvcCkgewotICAg ICAgICAgICAgLy8gdmVydGljYWwtYWxpZ246IHRvcCBpcyBhIGxpbmUgYm94IHJlbGF0aXZlIGFs aWdubWVudC4gSXQgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBkb3dud2FyZHMgbWVhbmluZyB0aGF0 IGl0IGRvZXMgbm90IGFmZmVjdAotICAgICAgICAgICAgLy8gdGhlIHJvb3QgaW5saW5lIGJveCdz IGJhc2VsaW5lIHBvc2l0aW9uLCBidXQgaW4gcXVpcmtzIG1vZGUgd2UgaGF2ZSB0byBlbnN1cmUg dGhhdCB0aGUgcm9vdCBpbmxpbmUgYm94IGRvZXMgbm90IGVuZCB1cCBhdCAwcHguCi0gICAgICAg ICAgICBpZiAoIW1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lKQotICAg ICAgICAgICAgICAgIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0g cm9vdElubGluZUJveC5hc2NlbnQoKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICBpZiAoIW1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGlu ZUJveEJhc2VsaW5lICYmIGhhc1RvcEFsaWduZWRJbmxpbmVMZXZlbEJveCkgeworICAgICAgICAv LyB2ZXJ0aWNhbC1hbGlnbjogdG9wIGlzIGEgbGluZSBib3ggcmVsYXRpdmUgYWxpZ25tZW50LiBJ dCBzdHJldGNoZXMgdGhlIGxpbmUgYm94IGRvd253YXJkcyBtZWFuaW5nIHRoYXQgaXQgZG9lcyBu b3QgYWZmZWN0CisgICAgICAgIC8vIHRoZSByb290IGlubGluZSBib3gncyBiYXNlbGluZSBwb3Np dGlvbiwgYnV0IGluIHF1aXJrcyBtb2RlIHdlIGhhdmUgdG8gZW5zdXJlIHRoYXQgdGhlIHJvb3Qg aW5saW5lIGJveCBkb2VzIG5vdCBlbmQgdXAgYXQgMHB4LgorICAgICAgICBtYXhpbXVtVG9wT2Zm c2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IHJvb3RJbmxpbmVCb3guYXNjZW50KCk7ICAg ICAgICAKICAgICB9Ci0gICAgYXV0byByb290SW5saW5lQm94TG9naWNhbFRvcCA9IG1heGltdW1U b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlX29yKDAuZikgLSByb290SW5s aW5lQm94LmFzY2VudCgpOworICAgIC8vIHZlcnRpY2FsLWFsaWduOiBib3R0b20gc3RyZXRjaGVz IHRoZSB0b3Agb2YgdGhlIGxpbmUgYm94IHB1c2hpbmcgdGhlIHJvb3QgaW5saW5lIGJveCBkb3du d2FyZHMuCisgICAgYXV0byBib3R0b21BbGlnbmVkQm94U3RyZXRjaCA9IHN0ZDo6bWF4KDAuZiwg bGluZUJveEhlaWdodC5ib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0LnZhbHVlX29yKDAu ZikgLSBsaW5lQm94SGVpZ2h0Lm5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQpOwor ICAgIGF1dG8gcm9vdElubGluZUJveExvZ2ljYWxUb3AgPSBib3R0b21BbGlnbmVkQm94U3RyZXRj aCArIG1heGltdW1Ub3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lLnZhbHVlX29yKDAu ZikgLSByb290SW5saW5lQm94LmFzY2VudCgpOwogICAgIHJvb3RJbmxpbmVCb3guc2V0TG9naWNh bFRvcChyb290SW5saW5lQm94TG9naWNhbFRvcCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0 aWNhbEFsaWduZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuaAppbmRleCBhODJiNDZmNjk2MmY5 ZDU0MTY0OTM5ODg4MzJhODA2ZDc3YmEyOTI5Li40N2U0NTNhY2QyYTE0ODQxNzMwZmI2M2VmZTc5 MWRkMjFjNzZiOGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eFZlcnRpY2FsQWxpZ25lci5oCkBAIC00MSw4ICs0MSwxNCBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIElubGluZUxheW91dFVuaXQgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50KExpbmVCb3gm KSBjb25zdDsKIAotICAgIElubGluZUxheW91dFVuaXQgY29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVp Z2h0KExpbmVCb3gmKSBjb25zdDsKLSAgICB2b2lkIGNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JikgY29uc3Q7CisgICAgc3RydWN0IExpbmVCb3hIZWlnaHQgewor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHZhbHVlKCkgY29uc3QgeyByZXR1cm4gc3RkOjptYXgo bm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCwgYm90dG9tQWxpZ25lZEJveGVzTWF4 aW11bUhlaWdodC52YWx1ZV9vcigwLmYpKTsgfQorCisgICAgICAgIElubGluZUxheW91dFVuaXQg bm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCB7IDAgfTsKKyAgICAgICAgc3RkOjpv cHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0 IHsgfTsKKyAgICB9OworICAgIExpbmVCb3hIZWlnaHQgY29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVp Z2h0KExpbmVCb3gmKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVSb290SW5saW5lQm94VmVydGlj YWxQb3NpdGlvbihMaW5lQm94JiwgY29uc3QgTGluZUJveEhlaWdodCYpIGNvbnN0OwogICAgIHZv aWQgYWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVC b3hMb2dpY2FsSGVpZ2h0KSBjb25zdDsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdHZW9t ZXRyeSYgZm9ybWF0dGluZ0dlb21ldHJ5KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0 aW5nR2VvbWV0cnk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3MGI4YTVjYmUyNWJiZjA1ZWMzZjM5NmE5MDdkMGU3M2Zi YjlkNmM4Li5lNWIzNWUwNzRhOThjNzA2YWFiZjIxMGE0MjgyMDk5ZWU0NWUyOTg3IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMTYgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgorCisgICAgICAgIFtMRkNdW0lGQ10gJ3ZlcnRpY2FsLWFsaWduOiBib3R0b20nIG1ha2VzIGlu bGluZSBsZXZlbCBib3hlcyBzdGljayBvdXQgb2YgdGhlaXIgcGFyZW50IGJsb2NrIGJveAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2Njc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBmYXN0L2lubGlu ZS92ZXJ0aWNhbC1hbGlnbi1ib3R0b20tZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog ZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9tLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAy LTE0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCBjcmFzaCB3aXRoIGRlZXBseSBuZXN0ZWQgYXN5bmMgb3ZlcmZsb3cgc2Nyb2xsCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0aWNhbC1hbGlnbi1ib3R0b20tZXhwZWN0 ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3ZlcnRpY2FsLWFsaWduLWJvdHRvbS1l eHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE0ZWUzYzE1NDFmMDY2OGYxYWFjMGU1NjJhMmIwOGU0 ODRlYzM5ZWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0 aWNhbC1hbGlnbi1ib3R0b20tZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE1IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxzdHlsZT4KK2RpdiB7CisgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAg IHdpZHRoOiAxMjBweDsKKyAgIG1hcmdpbi1ib3R0b206IDIwcHg7Cit9CisKKzwvc3R5bGU+Cis8 ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9ImhlaWdodDogMTAw cHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9ImhlaWdodDogMjAwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5 bGU9ImhlaWdodDogNTBweDsiPjwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyI+PC9k aXY+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwcHg7Ij48L2Rpdj4KXCBObyBuZXdsaW5lIGF0IGVu ZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0aWNhbC1h bGlnbi1ib3R0b20uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3ZlcnRpY2FsLWFsaWdu LWJvdHRvbS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjUzNzQ4NzhlZTA2ZmE1MGQwYzQwNDhkZDFmN2NjMTAx YWMzMDFlOTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS92ZXJ0 aWNhbC1hbGlnbi1ib3R0b20uaHRtbApAQCAtMCwwICsxLDQxIEBACis8IURPQ1RZUEUgaHRtbD4K KzxzdHlsZT4KKy5ibG9jayB7CisgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgIHdpZHRo OiAxMjBweDsKKyAgIG1hcmdpbi1ib3R0b206IDIwcHg7CisgICBjb2xvcjogdHJhbnNwYXJlbnQ7 CisgICBmb250LWZhbWlseTogQWhlbTsKKyAgIGZvbnQtc2l6ZTogMjBweDsKK30KKworLmFsaWdu ZWQtYm94IHsKKyAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICBiYWNrZ3JvdW5kLWNvbG9yOiBn cmVlbjsKKyAgd2lkdGg6IDUwcHg7CisgIGhlaWdodDogNTBweDsKKworfQorLm5vbi1saW5lQm94 LXJlbGF0aXZlIHsKKyAgIHZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsKKyAgIHdpZHRoOiA1MHB4 OworICAgaGVpZ2h0OiAyMHB4OworfQorLmJvdHRvbSB7CisgIHZlcnRpY2FsLWFsaWduOiBib3R0 b207CisKKyAgd2lkdGg6IDUwcHg7CisgIGhlaWdodDogNTBweDsKK30KKy50b3AgeworICB2ZXJ0 aWNhbC1hbGlnbjogdG9wOworCit9Cis8L3N0eWxlPgorPCEtLSBUaGUgbm9uLWxpbmUtYm94IHJl bGF0aXZlIGlubGluZSBsZXZlbCBib3hlcyBzaG91bGQgbm90IHN0aWNrIG91dCBvZiB0aGVpciBw YXJlbnQgYmxvY2sgYm94IC0tPgorPGRpdiBjbGFzcz1ibG9jaz5YPGRpdiBjbGFzcz0iYWxpZ25l ZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiPlg8L2Rpdj48ZGl2IGNsYXNzPSJhbGlnbmVkLWJv eCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1ibG9jaz5YPGRpdiBjbGFzcz0iYWxp Z25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiIHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyI+WDwv ZGl2PjxkaXYgY2xhc3M9ImFsaWduZWQtYm94IGJvdHRvbSI+PC9kaXY+PC9kaXY+Cis8ZGl2IGNs YXNzPWJsb2NrPlg8ZGl2IGNsYXNzPSJhbGlnbmVkLWJveCBub24tbGluZUJveC1yZWxhdGl2ZSIg c3R5bGU9InBhZGRpbmctYm90dG9tOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPlg8L2Rpdj48ZGl2 IGNsYXNzPSJhbGlnbmVkLWJveCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1ibG9j az5YPGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiPlg8L2Rpdj48 ZGl2IGNsYXNzPSJhbGlnbmVkLWJveCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1i bG9jaz5YPGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiIHN0eWxl PSJoZWlnaHQ6IDMwcHg7IHZlcnRpY2FsLWFsaWduOiBtaWRkbGUiPlg8L2Rpdj48ZGl2IGNsYXNz PSJhbGlnbmVkLWJveCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1ibG9jaz5YPGRp diBjbGFzcz0iYWxpZ25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiPlg8L2Rpdj48ZGl2IGNs YXNzPSJhbGlnbmVkLWJveCB0b3AiPjwvZGl2PjwvZGl2Pgo= 452373 2022-02-17 08:28:18 -0800 2022-02-17 18:52:52 -0800 Patch bug-236677-20220217082818.patch text/plain 15747 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGUxOWI0ZTY5OWUyYjY3 ZGI3NDU4OGY5MzMzNzM0MzJhNTY3ZmZmOS4uNDk4Yzc1NGNiY2UwZDVhMjY5YWMxYzQ5M2E1YjZh YTc2NDFiYzIyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTAyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdICd2ZXJ0aWNh bC1hbGlnbjogYm90dG9tJyBtYWtlcyBpbmxpbmUgbGV2ZWwgYm94ZXMgc3RpY2sgb3V0IG9mIHRo ZWlyIHBhcmVudCBibG9jayBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjY3NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgorCisgICAgICAgICd2ZXJ0aWNhbC1hbGlnbjogYm90dG9tJyBwdXNoZXMgdGhlIHJvb3QgaW5s aW5lIGJveCdzIGJhc2VsaW5lIGRvd24gYXMgaXQgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBkb3du d2FyZHMuCisgICAgICAgIEluIG1vc3QgY2FzZXMgdGhpcyBtYWtlcyB0aGUgcm9vdCBpbmxpbmUg Ym94IHNpdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBsaW5lIGJveCBlLmcuCisgICAgICAgICAgPGRp dj4KKyAgICAgICAgICAgIHNvbWUgdGV4dAorICAgICAgICAgICAgPGltZyBzdHlsZT0idmVydGlj YWwtYWxpZ246IGJvdHRvbTsgaGVpZ2h0OiAxMDBweDsgd2lkdGg6IDEwcHg7Ij4KKyAgICAgICAg ICA8L2Rpdj4KKyAgICAgICAgICBmb3JtcyBhIDEwMHB4IHRhbGwgYmxvY2sgYm94IHdoZXJlIHRo ZSAic29tZSB0ZXh0IiBzaXRzIGF0IHRoZSBib3R0b20gb2YgdGhlIGxpbmUgYW5kIHRoZSB0YWxs IGltYWdlIGZpbGxzIHRoZSByZXN0IG9mIHRoZSBsaW5lIGJveCBhbGwgdGhlIHdheSB0byB0aGUg dG9wLgorCisgICAgICAgICAgTm93IGlmIHdlIGFkZCBhbm90aGVyIGlubGluZSBsZXZlbCBib3gg d2l0aCBlLmcuIG1pZGRsZSBhbGlnbm1lbnQuCisgICAgICAgICAgPGRpdj4KKyAgICAgICAgICAg IHNvbWUgdGV4dAorICAgICAgICAgICAgPGltZyBzdHlsZT0idmVydGljYWwtYWxpZ246IG1pZGRs ZTsgaGVpZ2h0OiA4MHB4OyB3aWR0aDogMTBweDsiPgorICAgICAgICAgICAgPGltZyBzdHlsZT0i dmVydGljYWwtYWxpZ246IGJvdHRvbTsgaGVpZ2h0OiAxMDBweDsgd2lkdGg6IDEwcHg7Ij4KKyAg ICAgICAgICA8L2Rpdj4KKyAgICAgICAgICBXZSBzdGlsbCBmb3JtIGEgMTAwcHggdGFsbCBibG9j ayBib3ggd2hlcmUgdGhlICJzb21lIHRleHQiIGNvbnRlbnQgc2l0cyBhdCB0aGUgYm90dG9tIGFu ZCB0aGUgbWlkZGxlIGFsaWduZWQgYm94IHN0aWNrIG91dCBvZiB0aGUgYmxvY2sgYm94IGJ5IGFi b3V0IDQwcHggKG1pZGRsZSBhbGlnbm1lbnQgLT4gODBweC8yKSBhcyBpdCBpcyBhbGlnbmVkIGJh c2VkCisgICAgICAgICAgb24gdGhlIHJvb3QgaW5saW5lIGJveCdzIHBvc2l0aW9uICh3aGljaCBp cyBhdCB0aGUgdmVyeSBib3R0b20gb2YgdGhlIGJsb2NrIGNvbnRhaW5lcikuCisgICAgICAgICAg SW5zdGVhZCB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUgc2hvdWxkIGJlIHB1bGwgdXAg dG8gbWFrZSByb29tIGZvciB0aGUgbWlkZGxlIGFsaWduZWQgaW1hZ2UgYm94LgorCisgICAgICAg IFRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBpbmNvcnJlY3QgYmVoYXZpb3IgYnkgcmVtb3ZpbmcgdGhl IGxpbmUgYm94IHJlbGF0aXZlIGFsaWdubWVudCB0eXBlcyBmcm9tIHRoZSByZWd1bGFyIGFsaWdu bWVudCBsb2dpYyBhbmQgb2Zmc2V0dGluZyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFzZWxpbmUg cG9zaXRpb24gYXQgYSBsYXRlciBzdGVwLgorICAgICAgICBXaGF0IHdlIGRvIGhlcmUgaXMgd2Ug c2ltcGx5IGNvbXB1dGUgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHBvc2l0aW9uIGFz IGlmIHRoZXJlIHdlcmUgbm8gbGluZSBib3ggcmVsYXRpdmUgYWxpZ25lZCBib3hlcyBwcmVzZW50 IGFuZCBvZmZzZXQgdGhlIGZpbmFsIHJlc3VsdCBpZiBzdWNoIGJveCBoYXBwZW5zIHRvIHN0cmV0 Y2ggdGhlIGxpbmUgYm94LgorICAgICAgICAoZ29pbmcgYmFjayB0byB0aGUgZXhhbXBsZTogd2l0 aG91dCB0aGUgdGFsbCwgYm90dG9tIGFsaWduZWQgaW1hZ2UgYm94LCB3ZSBjb21wdXRlIHRoZSBy b290IGlubGluZSBib3gncyBiYXNlbGluZSBwb3NpdGlvbiB0byBiZSBhcm91bmQgNDBweCB0bwor ICAgICAgICBlbnN1cmUgdGhhdCB0aGUgODBweCBpbWFnZSBib3ggZml0cyBhbmQgbGF0ZXIgd2Ug cHVzaCBpdCBkb3duIHRvIDYwcHggKGFzIHRoZSAxMDBweCBpbWFnZSBib3ggc3RyZXRjaGVzIHRo ZSBsaW5lIGJveCBieSAyMHB4KS4pCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvdmVydGlj YWwtYWxpZ24tYm90dG9tLmh0bWwKKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlTG9naWNhbEhlaWdo dEFuZEFsaWduIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveFZlcnRp Y2FsQWxpZ25lcjo6Y29tcHV0ZUxpbmVCb3hMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxp bmVCb3hWZXJ0aWNhbFBvc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OkxpbmVCb3hIZWlnaHQ6 OnZhbHVlIGNvbnN0KToKKwogMjAyMi0wMi0xNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEZWNvdXBsZSBsaW5lIGJveCByZWxhdGl2ZSBhbGln bm1lbnQgdHlwZXMgd2hlbiBjb21wdXRpbmcgdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5l IHBvc2l0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0 aWNhbEFsaWduZXIuY3BwCmluZGV4IDQyYzI1NGE3NGNlYmY4ZjllZTAzMzA5YzhlZjI3Y2JiZDky OTYxZTcuLjQwOTYzMmE5ZWFjYjVmNjI3ZDQwZTQ3OTNkYzVjMWI5ZmZmNzVmMjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIuY3Bw CkBAIC04Myw5ICs4Myw5IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveFZlcnRpY2FsQWxpZ25l cjo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHRBbmRBbGlnbihMaW5lQm94JiBsCiAgICAgLy8gMy4gRmlu YWxseSBhbGlnbiB0aGUgaW5saW5lIGxldmVsIGJveGVzIHVzaW5nIChtb3N0bHkpIG5vcm1hbCBp bmxpbmUgbGV2ZWwgYm94IGdlb21ldHJpZXMuCiAgICAgQVNTRVJUKGxpbmVCb3guaGFzQ29udGVu dCgpKTsKICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxpbmVCb3hMb2dp Y2FsSGVpZ2h0KGxpbmVCb3gpOwotICAgIGNvbXB1dGVSb290SW5saW5lQm94VmVydGljYWxQb3Np dGlvbihsaW5lQm94KTsKLSAgICBhbGlnbklubGluZUxldmVsQm94ZXMobGluZUJveCwgbGluZUJv eExvZ2ljYWxIZWlnaHQpOwotICAgIHJldHVybiBsaW5lQm94TG9naWNhbEhlaWdodDsKKyAgICBj b21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24obGluZUJveCwgbGluZUJveExvZ2lj YWxIZWlnaHQpOworICAgIGFsaWduSW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBsaW5lQm94TG9n aWNhbEhlaWdodC52YWx1ZSgpKTsKKyAgICByZXR1cm4gbGluZUJveExvZ2ljYWxIZWlnaHQudmFs dWUoKTsKIH0KIAogSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94VmVydGljYWxBbGlnbmVyOjpzaW1w bGlmaWVkVmVydGljYWxBbGlnbm1lbnQoTGluZUJveCYgbGluZUJveCkgY29uc3QKQEAgLTExNyw3 ICsxMTcsNyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OnNpbXBs aWZpZWRWZXJ0aWNhbEFsaWdubWVudChMaW5lQm94JiBsaQogICAgIHJldHVybiBsaW5lQm94TG9n aWNhbEJvdHRvbSAtIGxpbmVCb3hMb2dpY2FsVG9wOwogfQogCi1JbmxpbmVMYXlvdXRVbml0IExp bmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94 JiBsaW5lQm94KSBjb25zdAorTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6TGluZUJveEhlaWdodCBM aW5lQm94VmVydGljYWxBbGlnbmVyOjpjb21wdXRlTGluZUJveExvZ2ljYWxIZWlnaHQoTGluZUJv eCYgbGluZUJveCkgY29uc3QKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIChwYXJ0aWFsbHkpIGlt cGxlbWVudHM6CiAgICAgLy8gMi4yLiBMYXlvdXQgV2l0aGluIExpbmUgQm94ZXMKQEAgLTIxNywy MCArMjE3LDMxIEBAIElubGluZUxheW91dFVuaXQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29t cHV0ZUxpbmVCb3hMb2dpY2FsSGVpZ2h0KExpbmVCb3gmIGxpCiAgICAgLy8gVGhlIGxpbmUgYm94 IGhlaWdodCBjb21wdXRhdGlvbiBpcyBhcyBmb2xsb3dzOgogICAgIC8vIDEuIFN0cmV0Y2ggdGhl IGxpbmUgYm94IHdpdGggdGhlIG5vbi1saW5lLWJveCByZWxhdGl2ZSBhbGlnbmVkIGlubGluZSBi b3ggYWJzb2x1dGUgdG9wIGFuZCBib3R0b20gdmFsdWVzLgogICAgIC8vIDIuIENoZWNrIGlmIHRo ZSBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbmVkIGlubGluZSBib3hlcyAodG9wLCBib3R0b20gZXRj KSBoYXZlIGVub3VnaCByb29tIGFuZCBzdHJldGNoIHRoZSBsaW5lIGJveCBmdXJ0aGVyIGlmIG5l ZWRlZC4KLSAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gdmFsdWVPckRlZmF1bHQobWF4 aW11bUxvZ2ljYWxCb3R0b20pIC0gdmFsdWVPckRlZmF1bHQobWluaW11bUxvZ2ljYWxUb3ApOwor ICAgIGF1dG8gbm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCA9IHZhbHVlT3JEZWZh dWx0KG1heGltdW1Mb2dpY2FsQm90dG9tKSAtIHZhbHVlT3JEZWZhdWx0KG1pbmltdW1Mb2dpY2Fs VG9wKTsKKyAgICBhdXRvIGJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQgPSBzdGQ6Om9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgfTsKICAgICBmb3IgKGF1dG8qIGxpbmVCb3hSZWxh dGl2ZUlubGluZUxldmVsQm94IDogbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3hlcykgewog ICAgICAgICBpZiAoIWZvcm1hdHRpbmdHZW9tZXRyeS5pbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5l Qm94KCpsaW5lQm94UmVsYXRpdmVJbmxpbmVMZXZlbEJveCwgbGluZUJveCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgbGluZUJveExvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1heChsaW5l Qm94TG9naWNhbEhlaWdodCwgbGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gtPmxheW91dEJv dW5kcygpLmhlaWdodCgpKTsKKyAgICAgICAgLy8gVGhpcyBsaW5lIGJveCByZWxhdGl2ZSBhbGln bmVkIGlubGluZSBsZXZlbCBib3ggc3RyZXRjaGVzIHRoZSBsaW5lIGJveC4KKyAgICAgICAgYXV0 byBpbmxpbmVMZXZlbEJveEhlaWdodCA9IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94LT5s YXlvdXRCb3VuZHMoKS5oZWlnaHQoKTsKKyAgICAgICAgaWYgKGxpbmVCb3hSZWxhdGl2ZUlubGlu ZUxldmVsQm94LT52ZXJ0aWNhbEFsaWduKCkudHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpUb3ApIHsK KyAgICAgICAgICAgIG5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQgPSBzdGQ6Om1h eChpbmxpbmVMZXZlbEJveEhlaWdodCwgbm9uQm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdo dCk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAobGluZUJv eFJlbGF0aXZlSW5saW5lTGV2ZWxCb3gtPnZlcnRpY2FsQWxpZ24oKS50eXBlID09IFZlcnRpY2Fs QWxpZ246OkJvdHRvbSkgeworICAgICAgICAgICAgYm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhl aWdodCA9IHN0ZDo6bWF4KGlubGluZUxldmVsQm94SGVpZ2h0LCBib3R0b21BbGlnbmVkQm94ZXNN YXhpbXVtSGVpZ2h0LnZhbHVlX29yKDAuZikpOworICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQotICAgIHJldHVybiBs aW5lQm94TG9naWNhbEhlaWdodDsKKyAgICByZXR1cm4geyBub25Cb3R0b21BbGlnbmVkQm94ZXNN YXhpbXVtSGVpZ2h0LCBib3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0IH07CiB9CiAKLXZv aWQgTGluZUJveFZlcnRpY2FsQWxpZ25lcjo6Y29tcHV0ZVJvb3RJbmxpbmVCb3hWZXJ0aWNhbFBv c2l0aW9uKExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0Cit2b2lkIExpbmVCb3hWZXJ0aWNhbEFsaWdu ZXI6OmNvbXB1dGVSb290SW5saW5lQm94VmVydGljYWxQb3NpdGlvbihMaW5lQm94JiBsaW5lQm94 LCBjb25zdCBMaW5lQm94SGVpZ2h0JiBsaW5lQm94SGVpZ2h0KSBjb25zdAogewogICAgIGF1dG8m IHJvb3RJbmxpbmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBhdXRvJiBmb3Jt YXR0aW5nR2VvbWV0cnkgPSB0aGlzLT5mb3JtYXR0aW5nR2VvbWV0cnkoKTsKLSAgICBWZWN0b3I8 dW5zaWduZWQ+IGlubGluZUxldmVsQm94SW5kZXhlc1dpdGhMaW5lQm94UmVsYXRpdmVBbGlnbm1l bnQ7CisgICAgYXV0byBoYXNUb3BBbGlnbmVkSW5saW5lTGV2ZWxCb3ggPSBmYWxzZTsKIAogICAg IEhhc2hNYXA8Y29uc3QgSW5saW5lTGV2ZWxCb3gqLCBJbmxpbmVMYXlvdXRVbml0PiBpbmxpbmVM ZXZlbEJveEFic29sdXRlQmFzZWxpbmVPZmZzZXRNYXA7CiAgICAgaW5saW5lTGV2ZWxCb3hBYnNv bHV0ZUJhc2VsaW5lT2Zmc2V0TWFwLmFkZCgmcm9vdElubGluZUJveCwgSW5saW5lTGF5b3V0VW5p dCB7IH0pOwpAQCAtMjUwLDEzICsyNjEsMTMgQEAgdm9pZCBMaW5lQm94VmVydGljYWxBbGlnbmVy Ojpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJveCYgbGluZUIKICAg ICAgICAgYXV0byB2ZXJ0aWNhbEFsaWduID0gaW5saW5lTGV2ZWxCb3gudmVydGljYWxBbGlnbigp OwogCiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5oYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1l bnQoKSkgewotICAgICAgICAgICAgaWYgKHZlcnRpY2FsQWxpZ24udHlwZSA9PSBWZXJ0aWNhbEFs aWduOjpUb3ApCisgICAgICAgICAgICBpZiAodmVydGljYWxBbGlnbi50eXBlID09IFZlcnRpY2Fs QWxpZ246OlRvcCkgeworICAgICAgICAgICAgICAgIGhhc1RvcEFsaWduZWRJbmxpbmVMZXZlbEJv eCA9IGhhc1RvcEFsaWduZWRJbmxpbmVMZXZlbEJveCB8fCBhZmZlY3RzUm9vdElubGluZUJveFZl cnRpY2FsUG9zaXRpb24oaW5saW5lTGV2ZWxCb3gpOwogICAgICAgICAgICAgICAgIGlubGluZUxl dmVsQm94QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoJmlubGluZUxldmVsQm94LCByb290 SW5saW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIGlubGluZUxldmVsQm94LmxheW91dEJv dW5kcygpLmFzY2VudCk7Ci0gICAgICAgICAgICBlbHNlIGlmICh2ZXJ0aWNhbEFsaWduLnR5cGUg PT0gVmVydGljYWxBbGlnbjo6Qm90dG9tKQorICAgICAgICAgICAgfSBlbHNlIGlmICh2ZXJ0aWNh bEFsaWduLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tKQogICAgICAgICAgICAgICAgIGlu bGluZUxldmVsQm94QWJzb2x1dGVCYXNlbGluZU9mZnNldE1hcC5hZGQoJmlubGluZUxldmVsQm94 LCBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50IC0gcm9vdElubGluZUJveC5s YXlvdXRCb3VuZHMoKS5kZXNjZW50KTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgIGlubGluZUxldmVsQm94SW5kZXhl c1dpdGhMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQuYXBwZW5kKGluZGV4KTsKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxl dmVsQm94LmxheW91dEJveCgpOwpAQCAtMzE1LDI0ICszMjYsMjAgQEAgdm9pZCBMaW5lQm94VmVy dGljYWxBbGlnbmVyOjpjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJv eCYgbGluZUIKICAgICAgICAgfQogICAgIH0KIAotICAgIGZvciAoYXV0byBpbmRleCA6IGlubGlu ZUxldmVsQm94SW5kZXhlc1dpdGhMaW5lQm94UmVsYXRpdmVBbGlnbm1lbnQpIHsKLSAgICAgICAg YXV0byYgaW5saW5lTGV2ZWxCb3ggPSBub25Sb290SW5saW5lTGV2ZWxCb3hlc1tpbmRleF07Ci0g ICAgICAgIGlmICghYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uKGlubGluZUxl dmVsQm94KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIGlmIChpbmxpbmVMZXZl bEJveC52ZXJ0aWNhbEFsaWduKCkudHlwZSA9PSBWZXJ0aWNhbEFsaWduOjpCb3R0b20pIHsKLSAg ICAgICAgICAgIGF1dG8gYmFzZWxpbmVPZmZzZXQgPSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3Vu ZHMoKS5kZXNjZW50IC0gcm9vdElubGluZUJveC5sYXlvdXRCb3VuZHMoKS5kZXNjZW50OwotICAg ICAgICAgICAgYXV0byB0b3BPZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gYmFzZWxp bmVPZmZzZXQgKyBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7Ci0gICAgICAg ICAgICBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSA9IHN0ZDo6bWF4 KCptYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSwgdG9wT2Zmc2V0RnJv bVJvb3RJbmxpbmVCb3hCYXNlbGluZSk7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW5saW5lTGV2ZWxC b3gudmVydGljYWxBbGlnbigpLnR5cGUgPT0gVmVydGljYWxBbGlnbjo6VG9wKSB7Ci0gICAgICAg ICAgICAvLyB2ZXJ0aWNhbC1hbGlnbjogdG9wIGlzIGEgbGluZSBib3ggcmVsYXRpdmUgYWxpZ25t ZW50LiBJdCBzdHJldGNoZXMgdGhlIGxpbmUgYm94IGRvd253YXJkcyBtZWFuaW5nIHRoYXQgaXQg ZG9lcyBub3QgYWZmZWN0Ci0gICAgICAgICAgICAvLyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgYmFz ZWxpbmUgcG9zaXRpb24sIGJ1dCBpbiBxdWlya3MgbW9kZSB3ZSBoYXZlIHRvIGVuc3VyZSB0aGF0 IHRoZSByb290IGlubGluZSBib3ggZG9lcyBub3QgZW5kIHVwIGF0IDBweC4KLSAgICAgICAgICAg IGlmICghbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUpCi0gICAgICAg ICAgICAgICAgbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSByb290 SW5saW5lQm94LmFzY2VudCgpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgIGlmICghbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94 QmFzZWxpbmUgJiYgaGFzVG9wQWxpZ25lZElubGluZUxldmVsQm94KSB7CisgICAgICAgIC8vIHZl cnRpY2FsLWFsaWduOiB0b3AgaXMgYSBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbm1lbnQuIEl0IHN0 cmV0Y2hlcyB0aGUgbGluZSBib3ggZG93bndhcmRzIG1lYW5pbmcgdGhhdCBpdCBkb2VzIG5vdCBh ZmZlY3QKKyAgICAgICAgLy8gdGhlIHJvb3QgaW5saW5lIGJveCdzIGJhc2VsaW5lIHBvc2l0aW9u LCBidXQgaW4gcXVpcmtzIG1vZGUgd2UgaGF2ZSB0byBlbnN1cmUgdGhhdCB0aGUgcm9vdCBpbmxp bmUgYm94IGRvZXMgbm90IGVuZCB1cCBhdCAwcHguCisgICAgICAgIG1heGltdW1Ub3BPZmZzZXRG cm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5hc2NlbnQoKTsKKyAgICB9 CisgICAgLy8gdmVydGljYWwtYWxpZ246IGJvdHRvbSBzdHJldGNoZXMgdGhlIHRvcCBvZiB0aGUg bGluZSBib3ggcHVzaGluZyB0aGUgcm9vdCBpbmxpbmUgYm94IGRvd253YXJkcy4KKyAgICBhdXRv IGJvdHRvbUFsaWduZWRCb3hTdHJldGNoID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgaWYg KGxpbmVCb3hIZWlnaHQuYm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCkgeworICAgICAg ICAvLyBOZWdhdGl2ZSB2ZXJ0aWNhbCBtYXJnaW4gY2FuIG1ha2UgYWxpZ25lZCBib3hlcyBoYXZl IG5lZ2F0aXZlIGhlaWdodC4gCisgICAgICAgIGJvdHRvbUFsaWduZWRCb3hTdHJldGNoID0gc3Rk OjptYXgoMC5mLCBsaW5lQm94SGVpZ2h0Lm5vbkJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWln aHQgPCAwCisgICAgICAgICAgICA/ICpsaW5lQm94SGVpZ2h0LmJvdHRvbUFsaWduZWRCb3hlc01h eGltdW1IZWlnaHQKKyAgICAgICAgICAgIDogc3RkOjptYXgoMC5mLCAqbGluZUJveEhlaWdodC5i b3R0b21BbGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0IC0gbGluZUJveEhlaWdodC5ub25Cb3R0b21B bGlnbmVkQm94ZXNNYXhpbXVtSGVpZ2h0KSk7CiAgICAgfQotICAgIGF1dG8gcm9vdElubGluZUJv eExvZ2ljYWxUb3AgPSBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZS52 YWx1ZV9vcigwLmYpIC0gcm9vdElubGluZUJveC5hc2NlbnQoKTsKKyAgICBhdXRvIHJvb3RJbmxp bmVCb3hMb2dpY2FsVG9wID0gYm90dG9tQWxpZ25lZEJveFN0cmV0Y2ggKyBtYXhpbXVtVG9wT2Zm c2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZS52YWx1ZV9vcigwLmYpIC0gcm9vdElubGluZUJv eC5hc2NlbnQoKTsKICAgICByb290SW5saW5lQm94LnNldExvZ2ljYWxUb3Aocm9vdElubGluZUJv eExvZ2ljYWxUb3ApOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94VmVydGljYWxBbGlnbmVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94VmVydGljYWxBbGlnbmVyLmgKaW5kZXggYTgyYjQ2ZjY5NjJmOWQ1NDE2NDkzOTg4ODMyYTgw NmQ3N2JhMjkyOS4uNDdlNDUzYWNkMmExNDg0MTczMGZiNjNlZmU3OTFkZDIxYzc2YjhmMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJveFZlcnRpY2FsQWxpZ25lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hWZXJ0aWNhbEFsaWduZXIu aApAQCAtNDEsOCArNDEsMTQgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBJbmxpbmVMYXlvdXRV bml0IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudChMaW5lQm94JikgY29uc3Q7CiAKLSAgICBJ bmxpbmVMYXlvdXRVbml0IGNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94JikgY29u c3Q7Ci0gICAgdm9pZCBjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJv eCYpIGNvbnN0OworICAgIHN0cnVjdCBMaW5lQm94SGVpZ2h0IHsKKyAgICAgICAgSW5saW5lTGF5 b3V0VW5pdCB2YWx1ZSgpIGNvbnN0IHsgcmV0dXJuIHN0ZDo6bWF4KG5vbkJvdHRvbUFsaWduZWRC b3hlc01heGltdW1IZWlnaHQsIGJvdHRvbUFsaWduZWRCb3hlc01heGltdW1IZWlnaHQudmFsdWVf b3IoMC5mKSk7IH0KKworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG5vbkJvdHRvbUFsaWduZWRC b3hlc01heGltdW1IZWlnaHQgeyAwIH07CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5 b3V0VW5pdD4gYm90dG9tQWxpZ25lZEJveGVzTWF4aW11bUhlaWdodCB7IH07CisgICAgfTsKKyAg ICBMaW5lQm94SGVpZ2h0IGNvbXB1dGVMaW5lQm94TG9naWNhbEhlaWdodChMaW5lQm94JikgY29u c3Q7CisgICAgdm9pZCBjb21wdXRlUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oTGluZUJv eCYsIGNvbnN0IExpbmVCb3hIZWlnaHQmKSBjb25zdDsKICAgICB2b2lkIGFsaWduSW5saW5lTGV2 ZWxCb3hlcyhMaW5lQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsaW5lQm94TG9naWNhbEhlaWdodCkg Y29uc3Q7CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkmIGZvcm1hdHRpbmdH ZW9tZXRyeSgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5OyB9CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggNjEzNzNjZTg0ZGIxZmY3YjZkN2JkOGZhNTc1MWI3M2M3ZjJiMGI4Zi4uN2Q0YmYzMzdj NDQ3OTdkMWIzM2U1OTc0NWNmYzBmNjYyOGI4NmFmOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDIyLTAyLTE3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZD XVtJRkNdICd2ZXJ0aWNhbC1hbGlnbjogYm90dG9tJyBtYWtlcyBpbmxpbmUgbGV2ZWwgYm94ZXMg c3RpY2sgb3V0IG9mIHRoZWlyIHBhcmVudCBibG9jayBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3NworCisgICAgICAgIFJldmlld2VkIGJ5 IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24t Ym90dG9tLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaW5saW5lL3ZlcnRp Y2FsLWFsaWduLWJvdHRvbS5odG1sOiBBZGRlZC4KKwogMjAyMi0wMi0xNyAgTWF0dCBXb29kcm93 ICA8bWF0dHdvb2Ryb3dAYXBwbGUuY29tPgogCiAgICAgICAgIENvcHkgdHJhY2sgc2l6ZXMgZnJv bSBwYXJlbnQgZ3JpZCBpbnRvIHN1YmdyaWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv aW5saW5lL3ZlcnRpY2FsLWFsaWduLWJvdHRvbS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9tLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYTRlZTNjMTU0MWYwNjY4ZjFhYWMwZTU2MmEyYjA4ZTQ4NGVjMzllZgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3ZlcnRpY2FsLWFsaWduLWJvdHRvbS1leHBl Y3RlZC5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorZGl2 IHsKKyAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgd2lkdGg6IDEyMHB4OworICAgbWFy Z2luLWJvdHRvbTogMjBweDsKK30KKworPC9zdHlsZT4KKzxkaXYgc3R5bGU9ImhlaWdodDogNTBw eDsiPjwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsiPjwvZGl2PgorPGRpdiBzdHls ZT0iaGVpZ2h0OiAyMDBweDsiPjwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyI+PC9k aXY+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9ImhlaWdo dDogNTBweDsiPjwvZGl2PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3ZlcnRpY2FsLWFsaWduLWJvdHRvbS5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvdmVydGljYWwtYWxpZ24tYm90dG9tLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMjA4Y2ZhNGI5MTQ0MmQzMmZmNTQzYWVlOWRjMWYzODgzNDNmNGI4ZgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3ZlcnRpY2FsLWFsaWduLWJvdHRvbS5odG1s CkBAIC0wLDAgKzEsNDIgQEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorLmJsb2NrIHsKKyAg IGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgd2lkdGg6IDEyMHB4OworICAgbWFyZ2luLWJv dHRvbTogMjBweDsKKyAgIGNvbG9yOiB0cmFuc3BhcmVudDsKKyAgIGZvbnQtZmFtaWx5OiBBaGVt OworICAgZm9udC1zaXplOiAyMHB4OworfQorCisuYWxpZ25lZC1ib3ggeworICBkaXNwbGF5OiBp bmxpbmUtYmxvY2s7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICB3aWR0aDogNTBweDsK KyAgaGVpZ2h0OiA1MHB4OworfQorCisubm9uLWxpbmVCb3gtcmVsYXRpdmUgeworICAgdmVydGlj YWwtYWxpZ246IGJhc2VsaW5lOworICAgd2lkdGg6IDUwcHg7CisgICBoZWlnaHQ6IDIwcHg7Cit9 CisKKy5ib3R0b20geworICB2ZXJ0aWNhbC1hbGlnbjogYm90dG9tOworCisgIHdpZHRoOiA1MHB4 OworICBoZWlnaHQ6IDUwcHg7Cit9CisKKy50b3AgeworICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwor fQorPC9zdHlsZT4KKzwhLS0gVGhlIG5vbi1saW5lLWJveCByZWxhdGl2ZSBpbmxpbmUgbGV2ZWwg Ym94ZXMgc2hvdWxkIG5vdCBzdGljayBvdXQgb2YgdGhlaXIgcGFyZW50IGJsb2NrIGJveCAtLT4K KzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWduZWQtYm94IG5vbi1saW5lQm94LXJl bGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggYm90dG9tIj48L2Rpdj48L2Rp dj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWduZWQtYm94IG5vbi1saW5lQm94 LXJlbGF0aXZlIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsiPlg8L2Rpdj48ZGl2IGNsYXNzPSJhbGln bmVkLWJveCBib3R0b20iPjwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1ibG9jaz5YPGRpdiBjbGFz cz0iYWxpZ25lZC1ib3ggbm9uLWxpbmVCb3gtcmVsYXRpdmUiIHN0eWxlPSJwYWRkaW5nLWJvdHRv bTogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3gg Ym90dG9tIj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWdu ZWQtYm94IG5vbi1saW5lQm94LXJlbGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1i b3ggYm90dG9tIj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFs aWduZWQtYm94IG5vbi1saW5lQm94LXJlbGF0aXZlIiBzdHlsZT0iaGVpZ2h0OiAzMHB4OyB2ZXJ0 aWNhbC1hbGlnbjogbWlkZGxlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggYm90dG9t Ij48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9YmxvY2s+WDxkaXYgY2xhc3M9ImFsaWduZWQtYm94 IG5vbi1saW5lQm94LXJlbGF0aXZlIj5YPC9kaXY+PGRpdiBjbGFzcz0iYWxpZ25lZC1ib3ggdG9w Ij48L2Rpdj48L2Rpdj4K