217646 2020-10-12 20:08:12 -0700 [LFC][IFC] Introduce InlineLevelBox::LineBreakBox and GenericInlineLevelBox 2020-10-13 10:11:19 -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 1697155 0 zalan 2020-10-12 20:08:12 -0700 ssia 1697156 1 411191 zalan 2020-10-12 20:10:39 -0700 Created attachment 411191 Patch 1697166 2 411194 zalan 2020-10-12 20:47:05 -0700 Created attachment 411194 Patch 1697235 3 411215 zalan 2020-10-13 06:37:05 -0700 Created attachment 411215 Patch 1697276 4 411224 zalan 2020-10-13 09:16:07 -0700 Created attachment 411224 Patch 1697294 5 ews-feeder 2020-10-13 10:10:47 -0700 Committed r268399: <https://trac.webkit.org/changeset/268399> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411224. 1697295 6 webkit-bug-importer 2020-10-13 10:11:19 -0700 <rdar://problem/70256572> 411191 2020-10-12 20:10:39 -0700 2020-10-12 20:47:03 -0700 Patch bug-217646-20201012201038.patch text/plain 10042 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVmZTA0YWFjNWQzOTdj NzNmMTI4MGRkMmFkMzRjY2EzMzJkYjI4OS4uMGY1OGMzZjgwMjJkOWQ4YThjY2Q0MjRiNzM2YzZm Nzk3NDViZDIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTEwLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgSW5saW5lTGV2ZWxCb3g6OkxpbmVCcmVha0JveCBhbmQgR2VuZXJpY0lubGluZUxldmVsQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc2NDYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBmb3IgaHR0cHM6Ly93d3cudzMub3Jn L1RSL2Nzcy1pbmxpbmUtMy8jbGF5b3V0LWJvdW5kcy4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxC b3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpJ bmxpbmVMZXZlbEJveCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZl bEJveDo6Y3JlYXRlUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxp bmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJv eDo6Y3JlYXRlTGluZUJyZWFrQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveCk6CisKIDIwMjAt MTAtMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg Rml4IHdoZWVsIGV2ZW50IHJlZ2lvbiBvdmVybGF5IHBhaW50aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDIwZDVjZjBjODUzYTI1NTYw N2ViMDJmYmY0OWU4NzcwMWQ5NWJkZGUuLmQ1NTU2MDg1ZGZjODQ4N2Y0YzU4NGMzMWUxZDQzODlj NzQ5ZjI5YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0yMzIsMjcgKzIzMiwxMiBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAg ICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJn aW5Cb3hIZWlnaHQoKTsKICAgICAgICAgICAgIGF1dG8gYmFzZWxpbmUgPSBsb2dpY2FsSGVpZ2h0 OwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5b3V0 Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAg ICAgIC8vIFRoZSBpbmxpbmUtYmxvY2sncyBiYXNlbGluZSBvZmZzZXQgaXMgcmVsYXRpdmUgdG8g aXRzIGNvbnRlbnQgYm94LiBMZXQncyBjb252ZXJ0IGl0IHJlbGF0aXZlIHRvIHRoZSBtYXJnaW4g Ym94LgotICAgICAgICAgICAgICAgIC8vICAgICAgICAgICBfX19fX19fX19fX19fX18gPC0gbWFy Z2luIGJveAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwKLSAgICAgICAgICAgICAgICAv LyAgICAgICAgICB8ICBfX19fX19fX19fX18gIDwtIGJvcmRlciBib3gKLSAgICAgICAgICAgICAg ICAvLyAgICAgICAgICB8IHwKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgIF9fX19f X19fXyAgPC0gY29udGVudCBib3gKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAg IF4KLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAgIHwgIDwtIGJhc2VsaW5lIG9m ZnNldAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwgfCB8ICAgfAotICAgICAgICAgICAg ICAgIC8vICAgICB0ZXh0IHwgfCB8ICAgdiB0ZXh0Ci0gICAgICAgICAgICAgICAgLy8gICAgIC0t LS0tfC18LXwtLS0tLS0tLS0tIDwtIGJhc2VsaW5lCi0gICAgICAgICAgICAgICAgLy8KICAgICAg ICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBsYXlvdXRTdGF0ZSgpLmVzdGFibGlz aGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94 KSk7CiAgICAgICAgICAgICAgICAgYXV0byYgbGFzdExpbmUgPSBmb3JtYXR0aW5nU3RhdGUubGlu ZXMoKS5sYXN0KCk7CiAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0g bGFzdExpbmUubG9naWNhbFRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKICAgICAgICAgICAg ICAgICBiYXNlbGluZSA9IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBp bmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlclRvcCgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRy eS5wYWRkaW5nVG9wKCkudmFsdWVPcigwKSArIGlubGluZUJsb2NrQmFzZWxpbmU7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQsIHsgcnVuLmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5l KTsKLSAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KQotICAgICAgICAgICAgICAgIGF0b21p Y0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7Ci0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKKyAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsgcnVuLmxv Z2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5lKSk7CiAgICAgICAgIH0gZWxz ZSBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFs TG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgp OwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CkBAIC0yNzAs MTMgKzI1NSwxMCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJv eGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAgICAgICAgIHBh cmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7CiAgICAgICAgICAgICAgICAgYWRqdXN0VmVy dGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KHBhcmVudElubGluZUJveCk7CiAgICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7Ci0g ICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KTsKLSAgICAgICAgICAgIGlu bGluZUJveC0+c2V0SXNOb25FbXB0eSgpOwotICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9t ZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KCppbmxpbmVCb3gpOwotICAgICAgICAgICAgbGluZUJv eC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2Ug aWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCi0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3go bGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KSk7CisgICAgICAgIH0gZWxzZSBpZiAocnVuLmlz SGFyZExpbmVCcmVhaygpKQorICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQsIGxheW91dEJveC5zdHlsZSgpLmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCkpKTsKKyAg ICAgICAgZWxzZSBpZiAocnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkKKyAgICAgICAgICAg IGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0 ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KSk7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJv eC5jcHAKaW5kZXggY2NiOWZlOGZjZmVhN2NlMjk4ZWI2NzU2NzRlNmU4MmY2ZDI0NDlhYi4uY2E4 ZjI5ZTAzYjBhOGU1NmQ5N2VkNmY3NDg0MGU2NzhkM2QzMjhjNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAK QEAgLTMyLDEwICszMiwxMSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91 dCB7CiAKLUxpbmVCb3g6OklubGluZUxldmVsQm94OjpJbmxpbmVMZXZlbEJveChjb25zdCBCb3gm IGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6 ZSBsb2dpY2FsU2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSwgVHlwZSB0eXBlKQorTGlu ZUJveDo6SW5saW5lTGV2ZWxCb3g6OklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxT aXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBib29sIGlzQ29uc2lkZXJlZEVtcHR5LCBU eXBlIHR5cGUpCiAgICAgOiBtX2xheW91dEJveChtYWtlV2Vha1B0cihsYXlvdXRCb3gpKQogICAg ICwgbV9sb2dpY2FsUmVjdCh7IH0sIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsU2l6ZS53aWR0aCgpLCBs b2dpY2FsU2l6ZS5oZWlnaHQoKSkKICAgICAsIG1fYmFzZWxpbmUoYmFzZWxpbmUpCisgICAgLCBt X2lzRW1wdHkoaXNDb25zaWRlcmVkRW1wdHkpCiAgICAgLCBtX3R5cGUodHlwZSkKIHsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaAppbmRleCA0ZDcwMDE5MWM5NGVkYWM0MzM0NDQwM2UyZjQ3OGQ5NWRjZWMzZWU3Li4y NTlhYWNiZjUzZmE1MDIxZDNmZGVjZTM0NThlZGE0ZjVhMjQzODJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBA IC02Myw2ICs2Myw4IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxM aW5lQm94OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlUm9vdElubGluZUJveChjb25zdCBCb3gmLCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCk7CiAgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxC b3g+IGNyZWF0ZUlubGluZUJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIHN0YXRpYyBzdGQ6 OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUF0b21pY0lubGluZUxl dmVsQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxh eW91dFNpemUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpOworICAgICAgICBzdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVhdGVMaW5lQnJlYWtCb3go Y29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94 OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYs IElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogCiAgICAgICAgIGNvbnN0IElubGluZVJl Y3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdDsgfQogICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxS ZWN0LnRvcCgpOyB9CkBAIC04NSw5ICs4NywxMSBAQCBwdWJsaWM6CiAgICAgICAgIGVudW0gY2xh c3MgVHlwZSB7CiAgICAgICAgICAgICBJbmxpbmVCb3gsCiAgICAgICAgICAgICBSb290SW5saW5l Qm94LAotICAgICAgICAgICAgQXRvbWljSW5saW5lTGV2ZWxCb3gKKyAgICAgICAgICAgIEF0b21p Y0lubGluZUxldmVsQm94LAorICAgICAgICAgICAgTGluZUJyZWFrQm94LAorICAgICAgICAgICAg R2VuZXJpY0lubGluZUxldmVsQm94CiAgICAgICAgIH07Ci0gICAgICAgIElubGluZUxldmVsQm94 KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNp emUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUsIFR5cGUpOworICAgICAgICBJbmxpbmVMZXZl bEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRTaXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBib29sIGlzRW1wdHksIFR5cGUpOwog ICAgICAgICBJbmxpbmVMZXZlbEJveCgpID0gZGVmYXVsdDsKIAogICAgIHByaXZhdGU6CkBAIC0x NTUsMTcgKzE1OSwyNyBAQCBwcml2YXRlOgogCiBpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPExpbmVC b3g6OklubGluZUxldmVsQm94PiBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlUm9vdElu bGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVm dCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7Ci0gICAgcmV0dXJuIG1ha2VVbmlx dWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGlu ZUxheW91dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRVbml0IHsgfSwg VHlwZTo6Um9vdElubGluZUJveCk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5s aW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyBs b2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRVbml0IHsgfSwgdHJ1ZSwgVHlwZTo6Um9v dElubGluZUJveCk7CiB9CiAKIGlubGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5l TGV2ZWxCb3g+IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZl bEJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkK IHsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5b3V0 Qm94LCBsb2dpY2FsTGVmdCwgbG9naWNhbFNpemUsIGJhc2VsaW5lLCBUeXBlOjpBdG9taWNJbmxp bmVMZXZlbEJveCk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2ZWxC b3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIGxvZ2ljYWxTaXplLCBiYXNlbGluZSwgIWxvZ2lj YWxTaXplLmhlaWdodCgpLCBUeXBlOjpBdG9taWNJbmxpbmVMZXZlbEJveCk7CiB9CiAKIGlubGlu ZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IExpbmVCb3g6OklubGlu ZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxh eW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogewot ICAgIHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gs IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbG9naWNhbFdpZHRoLCB7IH0gfSwgSW5s aW5lTGF5b3V0VW5pdCB7IH0sIFR5cGU6OklubGluZUJveCk7CisgICAgcmV0dXJuIG1ha2VVbmlx dWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGlu ZUxheW91dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRVbml0IHsgfSwg dHJ1ZSwgVHlwZTo6SW5saW5lQm94KTsKK30KKworaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5l Qm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVC cmVha0JveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVm dCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KQoreworICAgIHJldHVybiBtYWtlVW5p cXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxp bmVMYXlvdXRTaXplIHsgeyB9LCBsb2dpY2FsSGVpZ2h0IH0sIElubGluZUxheW91dFVuaXQgeyB9 LCBmYWxzZSwgVHlwZTo6TGluZUJyZWFrQm94KTsKK30KKworaW5saW5lIHN0ZDo6dW5pcXVlX3B0 cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0 ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsTGVmdCkKK3sKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxp bmVMZXZlbEJveD4obGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IH0s IElubGluZUxheW91dFVuaXQgeyB9LCB0cnVlLCBUeXBlOjpHZW5lcmljSW5saW5lTGV2ZWxCb3gp OwogfQogCiB9Cg== 411194 2020-10-12 20:47:05 -0700 2020-10-13 06:37:03 -0700 Patch bug-217646-20201012204704.patch text/plain 10037 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVmZTA0YWFjNWQzOTdj NzNmMTI4MGRkMmFkMzRjY2EzMzJkYjI4OS4uMGY1OGMzZjgwMjJkOWQ4YThjY2Q0MjRiNzM2YzZm Nzk3NDViZDIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTEwLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgSW5saW5lTGV2ZWxCb3g6OkxpbmVCcmVha0JveCBhbmQgR2VuZXJpY0lubGluZUxldmVsQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc2NDYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBmb3IgaHR0cHM6Ly93d3cudzMub3Jn L1RSL2Nzcy1pbmxpbmUtMy8jbGF5b3V0LWJvdW5kcy4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxC b3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpJ bmxpbmVMZXZlbEJveCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZl bEJveDo6Y3JlYXRlUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxp bmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJv eDo6Y3JlYXRlTGluZUJyZWFrQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveCk6CisKIDIwMjAt MTAtMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg Rml4IHdoZWVsIGV2ZW50IHJlZ2lvbiBvdmVybGF5IHBhaW50aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDIwZDVjZjBjODUzYTI1NTYw N2ViMDJmYmY0OWU4NzcwMWQ5NWJkZGUuLjk1M2NmNGQ4NDQ4ZTFlNjNkYWVhNDc2MGI0NDc0NGMy YmI5MGVhZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0yMzIsMjcgKzIzMiwxMiBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAg ICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJn aW5Cb3hIZWlnaHQoKTsKICAgICAgICAgICAgIGF1dG8gYmFzZWxpbmUgPSBsb2dpY2FsSGVpZ2h0 OwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5b3V0 Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAg ICAgIC8vIFRoZSBpbmxpbmUtYmxvY2sncyBiYXNlbGluZSBvZmZzZXQgaXMgcmVsYXRpdmUgdG8g aXRzIGNvbnRlbnQgYm94LiBMZXQncyBjb252ZXJ0IGl0IHJlbGF0aXZlIHRvIHRoZSBtYXJnaW4g Ym94LgotICAgICAgICAgICAgICAgIC8vICAgICAgICAgICBfX19fX19fX19fX19fX18gPC0gbWFy Z2luIGJveAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwKLSAgICAgICAgICAgICAgICAv LyAgICAgICAgICB8ICBfX19fX19fX19fX18gIDwtIGJvcmRlciBib3gKLSAgICAgICAgICAgICAg ICAvLyAgICAgICAgICB8IHwKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgIF9fX19f X19fXyAgPC0gY29udGVudCBib3gKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAg IF4KLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAgIHwgIDwtIGJhc2VsaW5lIG9m ZnNldAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwgfCB8ICAgfAotICAgICAgICAgICAg ICAgIC8vICAgICB0ZXh0IHwgfCB8ICAgdiB0ZXh0Ci0gICAgICAgICAgICAgICAgLy8gICAgIC0t LS0tfC18LXwtLS0tLS0tLS0tIDwtIGJhc2VsaW5lCi0gICAgICAgICAgICAgICAgLy8KICAgICAg ICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBsYXlvdXRTdGF0ZSgpLmVzdGFibGlz aGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94 KSk7CiAgICAgICAgICAgICAgICAgYXV0byYgbGFzdExpbmUgPSBmb3JtYXR0aW5nU3RhdGUubGlu ZXMoKS5sYXN0KCk7CiAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0g bGFzdExpbmUubG9naWNhbFRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKICAgICAgICAgICAg ICAgICBiYXNlbGluZSA9IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBp bmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlclRvcCgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRy eS5wYWRkaW5nVG9wKCkudmFsdWVPcigwKSArIGlubGluZUJsb2NrQmFzZWxpbmU7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQsIHsgcnVuLmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5l KTsKLSAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KQotICAgICAgICAgICAgICAgIGF0b21p Y0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7Ci0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKKyAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsgcnVuLmxv Z2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5lKSk7CiAgICAgICAgIH0gZWxz ZSBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFs TG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgp OwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CkBAIC0yNzAs MTMgKzI1NSwxMCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJv eGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAgICAgICAgIHBh cmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7CiAgICAgICAgICAgICAgICAgYWRqdXN0VmVy dGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KHBhcmVudElubGluZUJveCk7CiAgICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7Ci0g ICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KTsKLSAgICAgICAgICAgIGlu bGluZUJveC0+c2V0SXNOb25FbXB0eSgpOwotICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9t ZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KCppbmxpbmVCb3gpOwotICAgICAgICAgICAgbGluZUJv eC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2Ug aWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCi0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3go bGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KSk7CisgICAgICAgIH0gZWxzZSBpZiAocnVuLmlz SGFyZExpbmVCcmVhaygpKQorICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQpKTsKKyAgICAgICAgZWxzZSBpZiAocnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHko KSkKKyAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxM ZWZ0KSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggY2NiOWZlOGZjZmVhN2NlMjk4ZWI2NzU2NzRlNmU4 MmY2ZDI0NDlhYi4uY2E4ZjI5ZTAzYjBhOGU1NmQ5N2VkNmY3NDg0MGU2NzhkM2QzMjhjNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5jcHAKQEAgLTMyLDEwICszMiwxMSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog bmFtZXNwYWNlIExheW91dCB7CiAKLUxpbmVCb3g6OklubGluZUxldmVsQm94OjpJbmxpbmVMZXZl bEJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSwg VHlwZSB0eXBlKQorTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OklubGluZUxldmVsQm94KGNvbnN0 IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRTaXplIGxvZ2ljYWxTaXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBib29sIGlzQ29u c2lkZXJlZEVtcHR5LCBUeXBlIHR5cGUpCiAgICAgOiBtX2xheW91dEJveChtYWtlV2Vha1B0cihs YXlvdXRCb3gpKQogICAgICwgbV9sb2dpY2FsUmVjdCh7IH0sIGxvZ2ljYWxMZWZ0LCBsb2dpY2Fs U2l6ZS53aWR0aCgpLCBsb2dpY2FsU2l6ZS5oZWlnaHQoKSkKICAgICAsIG1fYmFzZWxpbmUoYmFz ZWxpbmUpCisgICAgLCBtX2lzRW1wdHkoaXNDb25zaWRlcmVkRW1wdHkpCiAgICAgLCBtX3R5cGUo dHlwZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA0ZDcwMDE5MWM5NGVkYWM0MzM0NDQwM2UyZjQ3 OGQ5NWRjZWMzZWU3Li4wM2QxOGEyZWYwOTFkMzFkNjIzMjhmMTIyNjY3YWY5ODU5ODg1YTlkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5oCkBAIC02Myw2ICs2Myw4IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGljIHN0 ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlUm9vdElubGluZUJv eChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJv eDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUlubGluZUJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAgICAg ICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0 ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNh bExlZnQsIElubGluZUxheW91dFNpemUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpOworICAg ICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVh dGVMaW5lQnJlYWtCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7 CisgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+ IGNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0KTsKIAogICAgICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgp IGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC50b3AoKTsgfQpAQCAt ODUsOSArODcsMTEgQEAgcHVibGljOgogICAgICAgICBlbnVtIGNsYXNzIFR5cGUgewogICAgICAg ICAgICAgSW5saW5lQm94LAogICAgICAgICAgICAgUm9vdElubGluZUJveCwKLSAgICAgICAgICAg IEF0b21pY0lubGluZUxldmVsQm94CisgICAgICAgICAgICBBdG9taWNJbmxpbmVMZXZlbEJveCwK KyAgICAgICAgICAgIExpbmVCcmVha0JveCwKKyAgICAgICAgICAgIEdlbmVyaWNJbmxpbmVMZXZl bEJveAogICAgICAgICB9OwotICAgICAgICBJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplLCBJbmxpbmVMYXlvdXRV bml0IGJhc2VsaW5lLCBUeXBlKTsKKyAgICAgICAgSW5saW5lTGV2ZWxCb3goY29uc3QgQm94Jiwg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSwgSW5saW5lTGF5 b3V0VW5pdCBiYXNlbGluZSwgYm9vbCBpc0VtcHR5LCBUeXBlKTsKICAgICAgICAgSW5saW5lTGV2 ZWxCb3goKSA9IGRlZmF1bHQ7CiAKICAgICBwcml2YXRlOgpAQCAtMTU1LDE3ICsxNTksMjggQEAg cHJpdmF0ZToKIAogaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJv eD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZVJvb3RJbmxpbmVCb3goY29uc3QgQm94 JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKQogewotICAgIHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGlu ZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbG9n aWNhbFdpZHRoLCB7IH0gfSwgSW5saW5lTGF5b3V0VW5pdCB7IH0sIFR5cGU6OlJvb3RJbmxpbmVC b3gpOworICAgIHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlv dXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbG9naWNhbFdpZHRoLCB7IH0g fSwgSW5saW5lTGF5b3V0VW5pdCB7IH0sIHRydWUsIFR5cGU6OlJvb3RJbmxpbmVCb3gpOwogfQog CiBpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBMaW5lQm94 OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBs YXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUg bG9naWNhbFNpemUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpCiB7Ci0gICAgcmV0dXJuIG1h a2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQs IGxvZ2ljYWxTaXplLCBiYXNlbGluZSwgVHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gpOworICAg IHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxv Z2ljYWxMZWZ0LCBsb2dpY2FsU2l6ZSwgYmFzZWxpbmUsICFsb2dpY2FsU2l6ZS5oZWlnaHQoKSwg VHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gpOwogfQogCiBpbmxpbmUgc3RkOjp1bmlxdWVfcHRy PExpbmVCb3g6OklubGluZUxldmVsQm94PiBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRl SW5saW5lQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKLSAgICByZXR1cm4gbWFrZVVu aXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgSW5s aW5lTGF5b3V0U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGluZUxheW91dFVuaXQgeyB9 LCBUeXBlOjpJbmxpbmVCb3gpOworICAgIHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGlu ZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgbG9n aWNhbFdpZHRoLCB7IH0gfSwgSW5saW5lTGF5b3V0VW5pdCB7IH0sIHRydWUsIFR5cGU6OklubGlu ZUJveCk7Cit9CisKK2lubGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxC b3g+IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3goY29uc3QgQm94 JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpCit7CisgICAgYXV0byYg Zm9udE1ldHJpY3MgPSBsYXlvdXRCb3guc3R5bGUoKS5mb250TWV0cmljcygpOworICAgIHJldHVy biBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgeyB9LCBJbmxpbmVMYXlvdXRVbml0KGZvbnRNZXRyaWNz LmhlaWdodCgpKSB9LCBJbmxpbmVMYXlvdXRVbml0KGZvbnRNZXRyaWNzLmFzY2VudCgpKSwgZmFs c2UsIFR5cGU6OkxpbmVCcmVha0JveCk7Cit9CisKK2lubGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGlu ZUJveDo6SW5saW5lTGV2ZWxCb3g+IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVHZW5l cmljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQg bG9naWNhbExlZnQpCit7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2 ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyB9LCBJbmxp bmVMYXlvdXRVbml0IHsgfSwgdHJ1ZSwgVHlwZTo6R2VuZXJpY0lubGluZUxldmVsQm94KTsKIH0K IAogfQo= 411215 2020-10-13 06:37:05 -0700 2020-10-13 09:16:06 -0700 Patch bug-217646-20201013063704.patch text/plain 10320 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVmZTA0YWFjNWQzOTdj NzNmMTI4MGRkMmFkMzRjY2EzMzJkYjI4OS4uZTE3YjYzOGU4ODc5NDRiYTRiZWJiOTU5Yjk4ZmYw OTBlODliMjVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTEwLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgSW5saW5lTGV2ZWxCb3g6OkxpbmVCcmVha0JveCBhbmQgR2VuZXJpY0lubGluZUxldmVsQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc2NDYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBmb3IgaHR0cHM6Ly93d3cudzMub3Jn L1RSL2Nzcy1pbmxpbmUtMy8jbGF5b3V0LWJvdW5kcy4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxC b3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpJ bmxpbmVMZXZlbEJveCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZl bEJveDo6Y3JlYXRlUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxp bmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJv eDo6Y3JlYXRlTGluZUJyZWFrQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJv eDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveCk6CisKIDIwMjAt MTAtMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg Rml4IHdoZWVsIGV2ZW50IHJlZ2lvbiBvdmVybGF5IHBhaW50aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDIwZDVjZjBjODUzYTI1NTYw N2ViMDJmYmY0OWU4NzcwMWQ5NWJkZGUuLjk1M2NmNGQ4NDQ4ZTFlNjNkYWVhNDc2MGI0NDc0NGMy YmI5MGVhZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0yMzIsMjcgKzIzMiwxMiBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAg ICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5tYXJn aW5Cb3hIZWlnaHQoKTsKICAgICAgICAgICAgIGF1dG8gYmFzZWxpbmUgPSBsb2dpY2FsSGVpZ2h0 OwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYgbGF5b3V0 Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAg ICAgIC8vIFRoZSBpbmxpbmUtYmxvY2sncyBiYXNlbGluZSBvZmZzZXQgaXMgcmVsYXRpdmUgdG8g aXRzIGNvbnRlbnQgYm94LiBMZXQncyBjb252ZXJ0IGl0IHJlbGF0aXZlIHRvIHRoZSBtYXJnaW4g Ym94LgotICAgICAgICAgICAgICAgIC8vICAgICAgICAgICBfX19fX19fX19fX19fX18gPC0gbWFy Z2luIGJveAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwKLSAgICAgICAgICAgICAgICAv LyAgICAgICAgICB8ICBfX19fX19fX19fX18gIDwtIGJvcmRlciBib3gKLSAgICAgICAgICAgICAg ICAvLyAgICAgICAgICB8IHwKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgIF9fX19f X19fXyAgPC0gY29udGVudCBib3gKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAg IF4KLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAgIHwgIDwtIGJhc2VsaW5lIG9m ZnNldAotICAgICAgICAgICAgICAgIC8vICAgICAgICAgIHwgfCB8ICAgfAotICAgICAgICAgICAg ICAgIC8vICAgICB0ZXh0IHwgfCB8ICAgdiB0ZXh0Ci0gICAgICAgICAgICAgICAgLy8gICAgIC0t LS0tfC18LXwtLS0tLS0tLS0tIDwtIGJhc2VsaW5lCi0gICAgICAgICAgICAgICAgLy8KICAgICAg ICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBsYXlvdXRTdGF0ZSgpLmVzdGFibGlz aGVkSW5saW5lRm9ybWF0dGluZ1N0YXRlKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94 KSk7CiAgICAgICAgICAgICAgICAgYXV0byYgbGFzdExpbmUgPSBmb3JtYXR0aW5nU3RhdGUubGlu ZXMoKS5sYXN0KCk7CiAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCbG9ja0Jhc2VsaW5lID0g bGFzdExpbmUubG9naWNhbFRvcCgpICsgbGFzdExpbmUuYmFzZWxpbmUoKTsKICAgICAgICAgICAg ICAgICBiYXNlbGluZSA9IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBp bmxpbmVMZXZlbEJveEdlb21ldHJ5LmJvcmRlclRvcCgpICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRy eS5wYWRkaW5nVG9wKCkudmFsdWVPcigwKSArIGlubGluZUJsb2NrQmFzZWxpbmU7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQsIHsgcnVuLmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5l KTsKLSAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KQotICAgICAgICAgICAgICAgIGF0b21p Y0lubGluZUxldmVsQm94LT5zZXRJc05vbkVtcHR5KCk7Ci0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKKyAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9naWNhbExlZnQsIHsgcnVuLmxv Z2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0sIGJhc2VsaW5lKSk7CiAgICAgICAgIH0gZWxz ZSBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSkgewogICAgICAgICAgICAgYXV0byBpbml0aWFs TG9naWNhbFdpZHRoID0gbGluZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgp OwogICAgICAgICAgICAgQVNTRVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CkBAIC0yNzAs MTMgKzI1NSwxMCBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJv eGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICAgICAgICAgIHBh cmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7CiAgICAgICAgICAgICAgICAgYWRqdXN0VmVy dGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KHBhcmVudElubGluZUJveCk7CiAgICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7Ci0g ICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVJbmxpbmVCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KTsKLSAgICAgICAgICAgIGlu bGluZUJveC0+c2V0SXNOb25FbXB0eSgpOwotICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9t ZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KCppbmxpbmVCb3gpOwotICAgICAgICAgICAgbGluZUJv eC5hZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICB9IGVsc2Ug aWYgKHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCi0gICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3go bGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KSk7CisgICAgICAgIH0gZWxzZSBpZiAocnVuLmlz SGFyZExpbmVCcmVhaygpKQorICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJveChM aW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQpKTsKKyAgICAgICAgZWxzZSBpZiAocnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHko KSkKKyAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goTGluZUJveDo6SW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGxvZ2ljYWxM ZWZ0KSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggY2NiOWZlOGZjZmVhN2NlMjk4ZWI2NzU2NzRlNmU4 MmY2ZDI0NDlhYi4uZGE2N2NhZDI4MWFkNTZkODdhM2QzZjA5NDdlMDlhZTE4MDk4N2Y4ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJveC5jcHAKQEAgLTMyLDEwICszMiw5IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBu YW1lc3BhY2UgTGF5b3V0IHsKIAotTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OklubGluZUxldmVs Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJ bmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBU eXBlIHR5cGUpCitMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6SW5saW5lTGV2ZWxCb3goY29uc3Qg Qm94JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91 dFNpemUgbG9naWNhbFNpemUsICBUeXBlIHR5cGUpCiAgICAgOiBtX2xheW91dEJveChtYWtlV2Vh a1B0cihsYXlvdXRCb3gpKQogICAgICwgbV9sb2dpY2FsUmVjdCh7IH0sIGxvZ2ljYWxMZWZ0LCBs b2dpY2FsU2l6ZS53aWR0aCgpLCBsb2dpY2FsU2l6ZS5oZWlnaHQoKSkKLSAgICAsIG1fYmFzZWxp bmUoYmFzZWxpbmUpCiAgICAgLCBtX3R5cGUodHlwZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA0 ZDcwMDE5MWM5NGVkYWM0MzM0NDQwM2UyZjQ3OGQ5NWRjZWMzZWU3Li42MzM5NTE4N2Y2ODRlNmZi YTM1NjE3Mjg5MDg3YWE5Nzc3MTIwYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC02Myw2ICs2Myw4IEBA IHB1YmxpYzoKICAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVM ZXZlbEJveD4gY3JlYXRlUm9vdElubGluZUJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIHN0 YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUlubGlu ZUJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGlu ZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJv eCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUsIElubGlu ZUxheW91dFVuaXQgYmFzZWxpbmUpOworICAgICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExp bmVCb3g6OklubGluZUxldmVsQm94PiBjcmVhdGVMaW5lQnJlYWtCb3goY29uc3QgQm94JiwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9w dHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChj b25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KTsKIAogICAgICAgICBjb25z dCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7 IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4g bV9sb2dpY2FsUmVjdC50b3AoKTsgfQpAQCAtODUsOSArODcsMTEgQEAgcHVibGljOgogICAgICAg ICBlbnVtIGNsYXNzIFR5cGUgewogICAgICAgICAgICAgSW5saW5lQm94LAogICAgICAgICAgICAg Um9vdElubGluZUJveCwKLSAgICAgICAgICAgIEF0b21pY0lubGluZUxldmVsQm94CisgICAgICAg ICAgICBBdG9taWNJbmxpbmVMZXZlbEJveCwKKyAgICAgICAgICAgIExpbmVCcmVha0JveCwKKyAg ICAgICAgICAgIEdlbmVyaWNJbmxpbmVMZXZlbEJveAogICAgICAgICB9OwotICAgICAgICBJbmxp bmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxp bmVMYXlvdXRTaXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lLCBUeXBlKTsKKyAgICAgICAg SW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSwgVHlwZSk7CiAgICAgICAgIElubGluZUxldmVsQm94KCkgPSBkZWZh dWx0OwogCiAgICAgcHJpdmF0ZToKQEAgLTE1NSwxNyArMTU5LDQyIEBAIHByaXZhdGU6CiAKIGlu bGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IExpbmVCb3g6Oklu bGluZUxldmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCkKIHsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5 b3V0Qm94LCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9 IH0sIElubGluZUxheW91dFVuaXQgeyB9LCBUeXBlOjpSb290SW5saW5lQm94KTsKKyAgICByZXR1 cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5b3V0Qm94LCBsb2dpY2Fs TGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9IH0sIFR5cGU6OlJvb3RJ bmxpbmVCb3gpOwogfQogCiBpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxl dmVsQm94PiBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxC b3goY29uc3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElu bGluZUxheW91dFNpemUgbG9naWNhbFNpemUsIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUpCiB7 Ci0gICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJv eCwgbG9naWNhbExlZnQsIGxvZ2ljYWxTaXplLCBiYXNlbGluZSwgVHlwZTo6QXRvbWljSW5saW5l TGV2ZWxCb3gpOworICAgIGF1dG8gYXRvbWljSW5saW5lTGV2ZWxCb3ggPSBtYWtlVW5pcXVlPExp bmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBsb2dpY2FsU2l6 ZSwgVHlwZTo6QXRvbWljSW5saW5lTGV2ZWxCb3gpOworICAgIGF0b21pY0lubGluZUxldmVsQm94 LT5zZXRCYXNlbGluZShiYXNlbGluZSk7CisgICAgaWYgKGxvZ2ljYWxTaXplLmhlaWdodCgpKQor ICAgICAgICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0SXNOb25FbXB0eSgpOworICAgIHJldHVy biBhdG9taWNJbmxpbmVMZXZlbEJveDsKIH0KIAogaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5l Qm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGlu ZUJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7Ci0gICAgcmV0dXJuIG1ha2VVbmlxdWU8 TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGluZUxh eW91dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRVbml0IHsgfSwgVHlw ZTo6SW5saW5lQm94KTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZl bEJveD4obGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxvZ2ljYWxX aWR0aCwgeyB9IH0sIFR5cGU6OklubGluZUJveCk7Cit9CisKK2lubGluZSBzdGQ6OnVuaXF1ZV9w dHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVh dGVMaW5lQnJlYWtCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9n aWNhbExlZnQpCit7CisgICAgYXV0byYgZm9udE1ldHJpY3MgPSBsYXlvdXRCb3guc3R5bGUoKS5m b250TWV0cmljcygpOworICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IGZvbnRN ZXRyaWNzLmhlaWdodCgpOworCisgICAgYXV0byBsaW5lQnJlYWtCb3ggPSBtYWtlVW5pcXVlPExp bmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRTaXplIHsgeyB9LCBsb2dpY2FsSGVpZ2h0IH0sIFR5cGU6OkxpbmVCcmVha0JveCk7CisKKyAg ICBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lID0gZm9udE1ldHJpY3MuYXNjZW50KCk7CisgICAg bGluZUJyZWFrQm94LT5zZXRCYXNlbGluZShiYXNlbGluZSk7CisgICAgbGluZUJyZWFrQm94LT5z ZXREZXNjZW50KGxvZ2ljYWxIZWlnaHQgLSBiYXNlbGluZSk7CisgICAgaWYgKGF1dG8gbGluZVNw YWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2luZygpIC0gbG9naWNhbEhlaWdodCkKKyAgICAg ICAgbGluZUJyZWFrQm94LT5zZXRMaW5lU3BhY2luZyhsaW5lU3BhY2luZyk7CisgICAgbGluZUJy ZWFrQm94LT5zZXRJc05vbkVtcHR5KCk7CisgICAgcmV0dXJuIGxpbmVCcmVha0JveDsKK30KKwor aW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUdlbmVyaWNJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxh eW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCkKK3sKKyAgICByZXR1cm4gbWFr ZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5b3V0Qm94LCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0U2l6ZSB7IH0sIFR5cGU6OkdlbmVyaWNJbmxpbmVMZXZlbEJveCk7CiB9CiAK IH0K 411224 2020-10-13 09:16:07 -0700 2020-10-13 10:10:47 -0700 Patch bug-217646-20201013091607.patch text/plain 16649 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVmZTA0YWFjNWQzOTdj NzNmMTI4MGRkMmFkMzRjY2EzMzJkYjI4OS4uMjEzYTg3ODdmZDE5MTU5ZDQ2ODAxMmUxZTI5ZjA3 ZWUyYTkxMTAzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEwLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgSW5saW5lTGV2ZWxCb3g6OkxpbmVCcmVha0JveCBhbmQgR2VuZXJpY0lubGluZUxldmVsQm94 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc2NDYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgc3VwcG9ydCBmb3IgaHR0cHM6Ly93d3cudzMub3Jn L1RSL2Nzcy1pbmxpbmUtMy8jbGF5b3V0LWJvdW5kcy4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxC b3hlcyk6IENsZWFuaW5nIHVwIGEgYml0IGFuZCBtb3ZpbmcgYWRqdXN0VmVydGljYWxHZW9tZXRy eUZvck5vbkVtcHR5SW5saW5lQm94CisgICAgICAgIHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uLiBj b25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzIHdhcyBnZXR0aW5nIGEgYml0IHRvbyBidXN5LgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6SW5saW5lTGV2ZWxC b3gpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0 ZVJvb3RJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxp bmVMZXZlbEJveDo6Y3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxp bmVCcmVha0JveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxl dmVsQm94OjpjcmVhdGVHZW5lcmljSW5saW5lTGV2ZWxCb3gpOgorCiAyMDIwLTEwLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB3aGVlbCBl dmVudCByZWdpb24gb3ZlcmxheSBwYWludGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAyMGQ1Y2YwYzg1M2EyNTU2MDdlYjAyZmJmNDll ODc3MDFkOTViZGRlLi42YTdjMTEzMmU1YWRkOWIzMTk0OGVhOTY3NzVmYzA3YjVhYWIwMmY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAt NDQsNiArNDQsNyBAQCBwdWJsaWM6CiAgICAgTGluZUJveCBidWlsZChjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnRlbnQmKTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIHNldFZlcnRpY2FsR2VvbWV0 cnlGb3JJbmxpbmVCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmKSBjb25zdDsKICAgICB2b2lk IGNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYsIGNvbnN0IExpbmU6OlJ1bkxpc3Qm KTsKICAgICB2b2lkIGFkanVzdElubGluZUJveGVzTG9naWNhbEhlaWdodChMaW5lQm94Jik7CiAg ICAgdm9pZCBhbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5QW5kQ29tcHV0ZUxpbmVCb3hI ZWlnaHQoTGluZUJveCYpOwpAQCAtMTYzLDM3ICsxNjQsMzkgQEAgTGluZUJveCBMaW5lQm94QnVp bGRlcjo6YnVpbGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkK ICAgICByZXR1cm4gbGluZUJveDsKIH0KIAordm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGlj YWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2 ZWxCb3gpIGNvbnN0Cit7CisgICAgQVNTRVJUKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkg fHwgaW5saW5lTGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSk7CisgICAgYXV0byYgZm9udE1ldHJp Y3MgPSBpbmxpbmVMZXZlbEJveC5mb250TWV0cmljcygpOworICAgIElubGluZUxheW91dFVuaXQg bG9naWNhbEhlaWdodCA9IGZvbnRNZXRyaWNzLmhlaWdodCgpOworICAgIElubGluZUxheW91dFVu aXQgYmFzZWxpbmUgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKKworICAgIGlubGluZUxldmVsQm94 LnNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCk7CisgICAgaW5saW5lTGV2ZWxCb3guc2V0 QmFzZWxpbmUoYmFzZWxpbmUpOworICAgIGlubGluZUxldmVsQm94LnNldERlc2NlbnQobG9naWNh bEhlaWdodCAtIGJhc2VsaW5lKTsKKyAgICBpZiAoYXV0byBsaW5lU3BhY2luZyA9IGZvbnRNZXRy aWNzLmxpbmVTcGFjaW5nKCkgLSBsb2dpY2FsSGVpZ2h0KQorICAgICAgICBpbmxpbmVMZXZlbEJv eC5zZXRMaW5lU3BhY2luZyhsaW5lU3BhY2luZyk7CisgICAgaW5saW5lTGV2ZWxCb3guc2V0SXNO b25FbXB0eSgpOworfQorCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7Ci0g ICAgYXV0byBhZGp1c3RWZXJ0aWNhbEdlb21ldHJ5Rm9yTm9uRW1wdHlJbmxpbmVCb3ggPSBbXShh dXRvJiBpbmxpbmVCb3gpIHsKLSAgICAgICAgLy8gSW5saW5lIGJveCB2ZXJ0aWNhbCBnZW9tZXRy eSBpcyBkcml2ZW4gYnkgZWl0aGVyIGNoaWxkIGlubGluZSBib3hlcyAoc2VlIGFkanVzdElubGlu ZUJveGVzTG9naWNhbEhlaWdodCkKLSAgICAgICAgLy8gb3IgdGhlIHRleHQgcnVucycgZm9udCBt ZXRyaWNzICh0ZXh0IHJ1bnMgZG9uJ3QgZ2VuZXJhdGUgaW5saW5lIGJveGVzKS4KLSAgICAgICAg QVNTRVJUKCFpbmxpbmVCb3guaXNFbXB0eSgpKTsKLSAgICAgICAgQVNTRVJUKGlubGluZUJveC5p c0lubGluZUJveCgpKTsKLSAgICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBpbmxpbmVCb3guZm9u dE1ldHJpY3MoKTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gZm9u dE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUgPSBm b250TWV0cmljcy5hc2NlbnQoKTsKLQotICAgICAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdo dChsb2dpY2FsSGVpZ2h0KTsKLSAgICAgICAgaW5saW5lQm94LnNldEJhc2VsaW5lKGJhc2VsaW5l KTsKLSAgICAgICAgaW5saW5lQm94LnNldERlc2NlbnQobG9naWNhbEhlaWdodCAtIGJhc2VsaW5l KTsKLSAgICAgICAgaWYgKGF1dG8gbGluZVNwYWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2lu ZygpIC0gbG9naWNhbEhlaWdodCkKLSAgICAgICAgICAgIGlubGluZUJveC5zZXRMaW5lU3BhY2lu ZyhsaW5lU3BhY2luZyk7Ci0gICAgfTsKICAgICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNl dCA9IGxpbmVCb3guaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5 b3V0VW5pdCB7IH0pOwotICAgIGF1dG8gY29uc3RydWN0Um9vdElubGluZUJveCA9IFsmXSB7CisK KyAgICBhdXRvIGNyZWF0ZVJvb3RJbmxpbmVCb3ggPSBbJl0gewogICAgICAgICBhdXRvIHJvb3RJ bmxpbmVCb3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlUm9vdElubGluZUJveChy b290Qm94KCksIGhvcml6b250YWxBbGlnbWVudE9mZnNldCwgbGluZUJveC5sb2dpY2FsV2lkdGgo KSk7CiAKICAgICAgICAgYXV0byBsaW5lSGFzSW1hZ2luYXJ5U3RydXQgPSAhbGF5b3V0U3RhdGUo KS5pblF1aXJrc01vZGUoKTsKICAgICAgICAgYXV0byBpc0luaXRpYWxseUNvbnNpZGVyZWROb25F bXB0eSA9ICFsaW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHkoKSAmJiBsaW5lSGFzSW1hZ2luYXJ5 U3RydXQ7Ci0gICAgICAgIGlmIChpc0luaXRpYWxseUNvbnNpZGVyZWROb25FbXB0eSkgewotICAg ICAgICAgICAgcm9vdElubGluZUJveC0+c2V0SXNOb25FbXB0eSgpOwotICAgICAgICAgICAgYWRq dXN0VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KCpyb290SW5saW5lQm94KTsK LSAgICAgICAgfQorICAgICAgICBpZiAoaXNJbml0aWFsbHlDb25zaWRlcmVkTm9uRW1wdHkpCisg ICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCpyb290SW5saW5lQm94 KTsKICAgICAgICAgbGluZUJveC5hZGRSb290SW5saW5lQm94KFdURk1vdmUocm9vdElubGluZUJv eCkpOwogICAgIH07Ci0gICAgY29uc3RydWN0Um9vdElubGluZUJveCgpOwotICAgIGlmICghcnVu cy5pc0VtcHR5KCkpIHsKKyAgICBjcmVhdGVSb290SW5saW5lQm94KCk7CisKKyAgICBhdXRvIGNy ZWF0ZVdyYXBwZWRJbmxpbmVCb3hlcyA9IFsmXSB7CisgICAgICAgIGlmIChydW5zLmlzRW1wdHko KSkKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgLy8gQW4gaW5saW5lIGJveCBtYXkgbm90 IG5lY2Vzc2FyaWx5IHN0YXJ0IG9uIHRoZSBjdXJyZW50IGxpbmU6CiAgICAgICAgIC8vIDxzcGFu IGlkPW91dGVyPmxpbmUgYnJlYWs8YnI+dGhpcyBjb250ZW50J3MgcGFyZW50IGlubGluZSBib3go J291dGVyJykgPHNwYW4gaWQ9aW5uZXI+c3RhcnRzIG9uIHRoZSBwcmV2aW91cyBsaW5lPC9zcGFu Pjwvc3Bhbj4KICAgICAgICAgLy8gV2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCB0aGVyZSdzIGFu IExpbmVCb3g6OklubGluZUxldmVsQm94IGZvciBldmVyeSBpbmxpbmUgYm94IHRoYXQncyBwcmVz ZW50IG9uIHRoZSBjdXJyZW50IGxpbmUuCkBAIC0yMDcsMjIgKzIxMCwyMiBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNv bnN0IExpbmU6OlJ1bgogICAgICAgICAvLyBlLmcuCiAgICAgICAgIC8vIDxzcGFuPm5vcm1hbGx5 IHRoZSBpbmxpbmUgYm94IGNsb3NpbmcgZm9ybXMgYSBjb250aW51b3VzIGNvbnRlbnQ8L3NwYW4+ CiAgICAgICAgIC8vIDxzcGFuPnVubGVzcyBpdCdzIGZvcmNlZCB0byB0aGUgbmV4dCBsaW5lPGJy Pjwvc3Bhbj4KLSAgICAgICAgaWYgKGZpcnN0UnVuLmlzQ29udGFpbmVyRW5kKCkgfHwgJmZpcnN0 UnVuUGFyZW50SW5saW5lQm94ICE9ICZyb290Qm94KCkpIHsKLSAgICAgICAgICAgIGF1dG8qIGFu Y2VzdG9yID0gJmZpcnN0UnVuUGFyZW50SW5saW5lQm94OwotICAgICAgICAgICAgVmVjdG9yPGNv bnN0IEJveCo+IGFuY2VzdG9yc1dpdGhvdXRJbmxpbmVCb3hlczsKLSAgICAgICAgICAgIHdoaWxl IChhbmNlc3RvciAhPSAmcm9vdEJveCgpKSB7Ci0gICAgICAgICAgICAgICAgYW5jZXN0b3JzV2l0 aG91dElubGluZUJveGVzLmFwcGVuZChhbmNlc3Rvcik7Ci0gICAgICAgICAgICAgICAgYW5jZXN0 b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8g Q29uc3RydWN0IHRoZSBtaXNzaW5nIExpbmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGgg dGhlIHRvcG1vc3QgYW5jZXN0b3IuCi0gICAgICAgICAgICBmb3IgKGF1dG8qIGFuY2VzdG9yIDog V1RGOjptYWtlUmV2ZXJzZWRSYW5nZShhbmNlc3RvcnNXaXRob3V0SW5saW5lQm94ZXMpKSB7Ci0g ICAgICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6 Y3JlYXRlSW5saW5lQm94KCphbmNlc3RvciwgaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0LCBsaW5l Qm94LmxvZ2ljYWxXaWR0aCgpKTsKLSAgICAgICAgICAgICAgICBpbmxpbmVCb3gtPnNldElzTm9u RW1wdHkoKTsKLSAgICAgICAgICAgICAgICBhZGp1c3RWZXJ0aWNhbEdlb21ldHJ5Rm9yTm9uRW1w dHlJbmxpbmVCb3goKmlubGluZUJveCk7Ci0gICAgICAgICAgICAgICAgbGluZUJveC5hZGRJbmxp bmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwotICAgICAgICAgICAgfQorICAgICAgICBp ZiAoJmZpcnN0UnVuUGFyZW50SW5saW5lQm94ID09ICZyb290Qm94KCkgJiYgIWZpcnN0UnVuLmlz Q29udGFpbmVyRW5kKCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGF1dG8qIGFuY2Vz dG9yID0gJmZpcnN0UnVuUGFyZW50SW5saW5lQm94OworICAgICAgICBWZWN0b3I8Y29uc3QgQm94 Kj4gYW5jZXN0b3JzV2l0aG91dElubGluZUJveGVzOworICAgICAgICB3aGlsZSAoYW5jZXN0b3Ig IT0gJnJvb3RCb3goKSkgeworICAgICAgICAgICAgYW5jZXN0b3JzV2l0aG91dElubGluZUJveGVz LmFwcGVuZChhbmNlc3Rvcik7CisgICAgICAgICAgICBhbmNlc3RvciA9ICZhbmNlc3Rvci0+cGFy ZW50KCk7CiAgICAgICAgIH0KLSAgICB9CisgICAgICAgIC8vIENvbnN0cnVjdCB0aGUgbWlzc2lu ZyBMaW5lQm94OjpJbmxpbmVCb3hlcyBzdGFydGluZyB3aXRoIHRoZSB0b3Btb3N0IGFuY2VzdG9y LgorICAgICAgICBmb3IgKGF1dG8qIGFuY2VzdG9yIDogV1RGOjptYWtlUmV2ZXJzZWRSYW5nZShh bmNlc3RvcnNXaXRob3V0SW5saW5lQm94ZXMpKSB7CisgICAgICAgICAgICBhdXRvIGlubGluZUJv eCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goKmFuY2VzdG9yLCBo b3Jpem9udGFsQWxpZ21lbnRPZmZzZXQsIGxpbmVCb3gubG9naWNhbFdpZHRoKCkpOworICAgICAg ICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveCgqaW5saW5lQm94KTsKKyAgICAg ICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKKyAg ICAgICAgfQorICAgIH07CisgICAgY3JlYXRlV3JhcHBlZElubGluZUJveGVzKCk7CiAKICAgICBm b3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxh eW91dEJveCgpOwpAQCAtMjMyLDI0ICsyMzUsMTMgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29u c3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4K ICAgICAgICAgICAgIGF1dG8gbG9naWNhbEhlaWdodCA9IGlubGluZUxldmVsQm94R2VvbWV0cnku bWFyZ2luQm94SGVpZ2h0KCk7CiAgICAgICAgICAgICBhdXRvIGJhc2VsaW5lID0gbG9naWNhbEhl aWdodDsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYmIGxh eW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAg ICAgICAgICAvLyBUaGUgaW5saW5lLWJsb2NrJ3MgYmFzZWxpbmUgb2Zmc2V0IGlzIHJlbGF0aXZl IHRvIGl0cyBjb250ZW50IGJveC4gTGV0J3MgY29udmVydCBpdCByZWxhdGl2ZSB0byB0aGUgbWFy Z2luIGJveC4KLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICAgX19fX19fX19fX19fX19fIDwt IG1hcmdpbiBib3gKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8Ci0gICAgICAgICAgICAg ICAgLy8gICAgICAgICAgfCAgX19fX19fX19fX19fICA8LSBib3JkZXIgYm94Ci0gICAgICAgICAg ICAgICAgLy8gICAgICAgICAgfCB8Ci0gICAgICAgICAgICAgICAgLy8gICAgICAgICAgfCB8ICBf X19fX19fX18gIDwtIGNvbnRlbnQgYm94Ci0gICAgICAgICAgICAgICAgLy8gICAgICAgICAgfCB8 IHwgICBeCi0gICAgICAgICAgICAgICAgLy8gICAgICAgICAgfCB8IHwgICB8ICA8LSBiYXNlbGlu ZSBvZmZzZXQKLSAgICAgICAgICAgICAgICAvLyAgICAgICAgICB8IHwgfCAgIHwKLSAgICAgICAg ICAgICAgICAvLyAgICAgdGV4dCB8IHwgfCAgIHYgdGV4dAotICAgICAgICAgICAgICAgIC8vICAg ICAtLS0tLXwtfC18LS0tLS0tLS0tLSA8LSBiYXNlbGluZQotICAgICAgICAgICAgICAgIC8vCiAg ICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUoKS5lc3Rh Ymxpc2hlZElubGluZUZvcm1hdHRpbmdTdGF0ZShkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91 dEJveCkpOwogICAgICAgICAgICAgICAgIGF1dG8mIGxhc3RMaW5lID0gZm9ybWF0dGluZ1N0YXRl LmxpbmVzKCkubGFzdCgpOwogICAgICAgICAgICAgICAgIGF1dG8gaW5saW5lQmxvY2tCYXNlbGlu ZSA9IGxhc3RMaW5lLmxvZ2ljYWxUb3AoKSArIGxhc3RMaW5lLmJhc2VsaW5lKCk7CiAgICAgICAg ICAgICAgICAgYmFzZWxpbmUgPSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgp ICsgaW5saW5lTGV2ZWxCb3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGlubGluZUxldmVsQm94R2Vv bWV0cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCkgKyBpbmxpbmVCbG9ja0Jhc2VsaW5lOwogICAg ICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBhdG9taWNJbmxpbmVMZXZlbEJveCA9IExpbmVC b3g6OklubGluZUxldmVsQm94OjpjcmVhdGVBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gs IGxvZ2ljYWxMZWZ0LCB7IHJ1bi5sb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCB9LCBiYXNl bGluZSk7CisgICAgICAgICAgICBhdXRvIGF0b21pY0lubGluZUxldmVsQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGxheW91dEJveCwgbG9n aWNhbExlZnQsIHsgcnVuLmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0IH0pOworICAgICAg ICAgICAgYXRvbWljSW5saW5lTGV2ZWxCb3gtPnNldEJhc2VsaW5lKGJhc2VsaW5lKTsKICAgICAg ICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KQogICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxl dmVsQm94LT5zZXRJc05vbkVtcHR5KCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxl dmVsQm94KFdURk1vdmUoYXRvbWljSW5saW5lTGV2ZWxCb3gpKTsKQEAgLTI2NSwxOCArMjU3LDE1 IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJv eCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzVGV4 dCgpIHx8IHJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgYXV0byYgcGFyZW50 Qm94ID0gbGF5b3V0Qm94LnBhcmVudCgpOwogICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5l Qm94ID0gJnBhcmVudEJveCA9PSAmcm9vdEJveCgpID8gbGluZUJveC5yb290SW5saW5lQm94KCkg OiBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KHBhcmVudEJveCk7Ci0gICAgICAg ICAgICBpZiAocGFyZW50SW5saW5lQm94LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgICAgIC8v IEZJWE1FOiBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdoZW4gZ2x5cGhzIGZy b20gdGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgotICAgICAgICAgICAgICAg IHBhcmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7Ci0gICAgICAgICAgICAgICAgYWRqdXN0 VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94KHBhcmVudElubGluZUJveCk7Ci0g ICAgICAgICAgICB9CisgICAgICAgICAgICAvLyBGSVhNRTogQWRqdXN0IG5vbi1lbXB0eSBpbmxp bmUgYm94IGhlaWdodCB3aGVuIGdseXBocyBmcm9tIHRoZSBub24tcHJpbWFyeSBmb250IHN0cmV0 Y2ggdGhlIGJveC4KKyAgICAgICAgICAgIGlmIChwYXJlbnRJbmxpbmVCb3guaXNFbXB0eSgpKQor ICAgICAgICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3gocGFyZW50SW5s aW5lQm94KTsKICAgICAgICAgfSBlbHNlIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKLSAg ICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0 ZUlubGluZUJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCB7IH0pOwotICAgICAgICAgICAgaW5s aW5lQm94LT5zZXRJc05vbkVtcHR5KCk7Ci0gICAgICAgICAgICBhZGp1c3RWZXJ0aWNhbEdlb21l dHJ5Rm9yTm9uRW1wdHlJbmxpbmVCb3goKmlubGluZUJveCk7Ci0gICAgICAgICAgICBsaW5lQm94 LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CisgICAgICAgICAgICBhdXRv IGxpbmVCcmVha0JveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtC b3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCk7CisgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21l dHJ5Rm9ySW5saW5lQm94KCpsaW5lQnJlYWtCb3gpOworICAgICAgICAgICAgbGluZUJveC5hZGRJ bmxpbmVMZXZlbEJveChXVEZNb3ZlKGxpbmVCcmVha0JveCkpOwogICAgICAgICB9IGVsc2UgaWYg KHJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpCi0gICAgICAgICAgICBsaW5lQm94LmFkZElu bGluZUxldmVsQm94KExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5 b3V0Qm94LCBsb2dpY2FsTGVmdCwgeyB9KSk7CisgICAgICAgICAgICBsaW5lQm94LmFkZElubGlu ZUxldmVsQm94KExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVHZW5lcmljSW5saW5lTGV2 ZWxCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGNjYjlm ZThmY2ZlYTdjZTI5OGViNjc1Njc0ZTZlODJmNmQyNDQ5YWIuLmRhNjdjYWQyODFhZDU2ZDg3YTNk M2YwOTQ3ZTA5YWUxODA5ODdmOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0zMiwxMCArMzIsOSBA QAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKLUxpbmVCb3g6Oklu bGluZUxldmVsQm94OjpJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSwgSW5s aW5lTGF5b3V0VW5pdCBiYXNlbGluZSwgVHlwZSB0eXBlKQorTGluZUJveDo6SW5saW5lTGV2ZWxC b3g6OklubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplLCAgVHlwZSB0eXBlKQog ICAgIDogbV9sYXlvdXRCb3gobWFrZVdlYWtQdHIobGF5b3V0Qm94KSkKICAgICAsIG1fbG9naWNh bFJlY3QoeyB9LCBsb2dpY2FsTGVmdCwgbG9naWNhbFNpemUud2lkdGgoKSwgbG9naWNhbFNpemUu aGVpZ2h0KCkpCi0gICAgLCBtX2Jhc2VsaW5lKGJhc2VsaW5lKQogICAgICwgbV90eXBlKHR5cGUp CiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmgKaW5kZXggNGQ3MDAxOTFjOTRlZGFjNDMzNDQ0MDNlMmY0NzhkOTVk Y2VjM2VlNy4uMTNjOTQ2MWExZjUzZGVjNjY2MTVhNTA0ZTM1YmEyMTFiZGEwMzQ5NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaApAQCAtNjIsNyArNjIsOSBAQCBwdWJsaWM6CiAgICAgcHVibGljOgogICAgICAgICBz dGF0aWMgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVhdGVSb290 SW5saW5lQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGlu ZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0 cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlSW5saW5lQm94KGNvbnN0IEJveCYsIElu bGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo KTsKLSAgICAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJv eD4gY3JlYXRlQXRvbWljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSwgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGlu ZSk7CisgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxC b3g+IGNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVu aXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUpOworICAgICAgICBzdGF0aWMgc3RkOjp1 bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVhdGVMaW5lQnJlYWtCb3goY29u c3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CisgICAgICAgIHN0YXRpYyBz dGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+IGNyZWF0ZUdlbmVyaWNJbmxp bmVMZXZlbEJveChjb25zdCBCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KTsKIAog ICAgICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1f bG9naWNhbFJlY3Q7IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsVG9wKCkgY29u c3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC50b3AoKTsgfQpAQCAtODAsMTQgKzgyLDE4IEBAIHB1 YmxpYzoKICAgICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbGluZVNwYWNpbmcoKSBj b25zdCB7IHJldHVybiBtX2xpbmVTcGFjaW5nOyB9CiAgICAgICAgIGNvbnN0IEZvbnRNZXRyaWNz JiBmb250TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0eWxlKCkuZm9udE1l dHJpY3MoKTsgfQogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJu ICptX2xheW91dEJveDsgfQorCiAgICAgICAgIGJvb2wgaXNJbmxpbmVCb3goKSBjb25zdCB7IHJl dHVybiBtX3R5cGUgPT0gVHlwZTo6SW5saW5lQm94IHx8IG1fdHlwZSA9PSBUeXBlOjpSb290SW5s aW5lQm94OyB9CisgICAgICAgIGJvb2wgaXNMaW5lQnJlYWtCb3goKSBjb25zdCB7IHJldHVybiBt X3R5cGUgPT0gVHlwZTo6TGluZUJyZWFrQm94OyB9CiAKICAgICAgICAgZW51bSBjbGFzcyBUeXBl IHsKICAgICAgICAgICAgIElubGluZUJveCwKICAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gsCi0g ICAgICAgICAgICBBdG9taWNJbmxpbmVMZXZlbEJveAorICAgICAgICAgICAgQXRvbWljSW5saW5l TGV2ZWxCb3gsCisgICAgICAgICAgICBMaW5lQnJlYWtCb3gsCisgICAgICAgICAgICBHZW5lcmlj SW5saW5lTGV2ZWxCb3gKICAgICAgICAgfTsKLSAgICAgICAgSW5saW5lTGV2ZWxCb3goY29uc3Qg Qm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSwgSW5s aW5lTGF5b3V0VW5pdCBiYXNlbGluZSwgVHlwZSk7CisgICAgICAgIElubGluZUxldmVsQm94KGNv bnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUs IFR5cGUpOwogICAgICAgICBJbmxpbmVMZXZlbEJveCgpID0gZGVmYXVsdDsKIAogICAgIHByaXZh dGU6CkBAIC0xNTUsMTcgKzE2MSwyNyBAQCBwcml2YXRlOgogCiBpbmxpbmUgc3RkOjp1bmlxdWVf cHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3Jl YXRlUm9vdElubGluZUJveChjb25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBs b2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7Ci0gICAgcmV0dXJu IG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExl ZnQsIElubGluZUxheW91dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRV bml0IHsgfSwgVHlwZTo6Um9vdElubGluZUJveCk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGlu ZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGluZUxheW91 dFNpemUgeyBsb2dpY2FsV2lkdGgsIHsgfSB9LCBUeXBlOjpSb290SW5saW5lQm94KTsKIH0KIAot aW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxv Z2ljYWxTaXplLCBJbmxpbmVMYXlvdXRVbml0IGJhc2VsaW5lKQoraW5saW5lIHN0ZDo6dW5pcXVl X3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNy ZWF0ZUF0b21pY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplKQogewotICAg IHJldHVybiBtYWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxv Z2ljYWxMZWZ0LCBsb2dpY2FsU2l6ZSwgYmFzZWxpbmUsIFR5cGU6OkF0b21pY0lubGluZUxldmVs Qm94KTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5 b3V0Qm94LCBsb2dpY2FsTGVmdCwgbG9naWNhbFNpemUsIFR5cGU6OkF0b21pY0lubGluZUxldmVs Qm94KTsKIH0KIAogaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJv eD4gTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChjb25zdCBCb3gmIGxh eW91dEJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBs b2dpY2FsV2lkdGgpCiB7Ci0gICAgcmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2 ZWxCb3g+KGxheW91dEJveCwgbG9naWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyBsb2dpY2Fs V2lkdGgsIHsgfSB9LCBJbmxpbmVMYXlvdXRVbml0IHsgfSwgVHlwZTo6SW5saW5lQm94KTsKKyAg ICByZXR1cm4gbWFrZVVuaXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4obGF5b3V0Qm94LCBs b2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGxvZ2ljYWxXaWR0aCwgeyB9IH0sIFR5cGU6 OklubGluZUJveCk7Cit9CisKK2lubGluZSBzdGQ6OnVuaXF1ZV9wdHI8TGluZUJveDo6SW5saW5l TGV2ZWxCb3g+IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3goY29u c3QgQm94JiBsYXlvdXRCb3gsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpCit7CisgICAg cmV0dXJuIG1ha2VVbmlxdWU8TGluZUJveDo6SW5saW5lTGV2ZWxCb3g+KGxheW91dEJveCwgbG9n aWNhbExlZnQsIElubGluZUxheW91dFNpemUgeyB9LCBUeXBlOjpMaW5lQnJlYWtCb3gpOworfQor CitpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBMaW5lQm94 OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlR2VuZXJpY0lubGluZUxldmVsQm94KGNvbnN0IEJveCYg bGF5b3V0Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KQoreworICAgIHJldHVybiBt YWtlVW5pcXVlPExpbmVCb3g6OklubGluZUxldmVsQm94PihsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0 LCBJbmxpbmVMYXlvdXRTaXplIHsgfSwgVHlwZTo6R2VuZXJpY0lubGluZUxldmVsQm94KTsKIH0K IAogfQo=