219574 2020-12-05 21:13:49 -0800 [LFC][IFC] BoxGeometry should provide an enclosing rect for multiline inline boxes 2020-12-06 10:59:15 -0800 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 1712296 0 zalan 2020-12-05 21:13:49 -0800 <span>first<br>second<br>third</span> 1712297 1 415509 zalan 2020-12-05 21:21:38 -0800 Created attachment 415509 Patch 1712323 2 415516 zalan 2020-12-06 07:44:22 -0800 Created attachment 415516 Patch 1712332 3 ews-feeder 2020-12-06 10:58:37 -0800 Committed r270485: <https://trac.webkit.org/changeset/270485> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415516. 1712333 4 webkit-bug-importer 2020-12-06 10:59:15 -0800 <rdar://problem/72024799> 415509 2020-12-05 21:21:38 -0800 2020-12-06 07:44:20 -0800 Patch bug-219574-20201205212138.patch text/plain 12498 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ1NzI0NTdhZmNjNjNk MmRiZjU5Mjg1YmQ2ZWFjOWIyMzc0YzE2Mi4uNzBhYzFiYjJjNmU3NDAwNGZmNzkwNmJjY2E5ZDMz ZmU0YzE2YjU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBCb3hHZW9t ZXRyeSBzaG91bGQgcHJvdmlkZSBhbiBlbmNsb3NpbmcgcmVjdCBmb3IgbXVsdGlsaW5lIGlubGlu ZSBib3hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE5NTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBwYXRjaCBhZGQgc3VwcG9ydCBmb3IgbXVsdGlsaW5lIGlubGluZSBib3ggZ2VvbWV0cnkg KGUuZy4gPHNwYW4+Zmlyc3Q8YnI+c2Vjb25kPC9zcGFuPikKKyAgICAgICAgSW4gc3VjaCBjYXNl cyB3ZSB0dXJuIHRoZSBjb250ZW50IGJveCBpbnRvIHRoZSBlbmNsb3NpbmcgcmVjdCAoYm9yZGVy IGFuZCBwYWRkaW5nIGRvIG5vdCBtYWtlIHRvbyBtdWNoIHNlbnNlIGluIG11bHRpbGluZSBjYXNl KQorICAgICAgICBUaGlzIGlzIG5vdCB0byBiZSBjb25mdXNlZCB3aXRoIEVsZW1lbnQuZ2V0Q2xp ZW50UmVjdHMoKSB3aGljaCByZXR1cm5zIGEgbGlzdCBvZiByZWN0cyB3aGVyZSBib3JkZXIgYW5k IHBhZGRpbmcgc3RhcnQgbWFraW5nIHNlbnNlLiAKKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KToKKyAgICAgICAgc2V0IHRoZSBib3ggZ2VvbWV0cnkgZGVwZW5kaW5nIG9uIHdoZXRo ZXIgdGhpcyBpcyB0aGUgZmlyc3QgbGluZSB3aGVyZSB0aGUgaW5saW5lIGJveCBzaG93cyBvciB3 ZSBhcmUgcHJvY2Vzc2luZyBhbiBpbi1iZXR3ZWVuIG9yIGVuZCBsaW5lLgorCisgICAgICAgICog bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6ZW5jbG9zaW5nQm9y ZGVyQm94UmVjdEZvciBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0 R2VvbWV0cnlSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlJlY3Q6Om1vdmVCeSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlJlY3Q6OmV4cGFuZFRvQ29udGFpbik6CisKIDIw MjAtMTItMDQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJbnRlZ3JhdGlvbl0gRG8gbm90IGNvbnN0cnVjdCBhIG5ldyBsYXlvdXQgYm94IGZvciBldmVy eSBpbmxpbmUgYm94IGVuZCAoSW5saW5lV2Fsa2VyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCmluZGV4IGExZWNmNGEwYmI4NzUxNWFiM2E1NDlhZDlhNmExYTBjNWVlN2E5YWIu LjhmNWRhMzBmNmJlMzAyNWM1NTc3MzAwYTIzMmYyYjYxMGQ4Y2VmMzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQxNCwxOSArNDE0LDI2IEBAIElubGluZVJlY3Qg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNv bnN0IExpbmVCdWlsCiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goZ2VvbWV0cnkubGlu ZUJveEZvckxpbmVDb250ZW50KGxpbmVDb250ZW50KSk7CiAgICAgY29uc3QgYXV0byYgbGluZUJv eCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lQm94ZXMoKS5sYXN0KCk7CiAgICAgYXV0byYgbGluZUJv eExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdCgpOworICAgIEhhc2hTZXQ8Y29uc3Qg Qm94Kj4gaW5saW5lQm94U3RhcnRTZXQ7CisgICAgSGFzaFNldDxjb25zdCBCb3gqPiBpbmxpbmVC b3hFbmRTZXQ7CiAKICAgICBhdXRvIGNvbnN0cnVjdExpbmVSdW5zID0gWyZdIHsKICAgICAgICAg YXV0byBsaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXplKCk7CiAgICAgICAg IC8vIENyZWF0ZSB0aGUgaW5saW5lIHJ1bnMgb24gdGhlIGN1cnJlbnQgbGluZS4gVGhpcyBpcyBt b3N0bHkgdGV4dCBhbmQgYXRvbWljIGlubGluZSBydW5zLgogICAgICAgICBmb3IgKGF1dG8mIGxp bmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hv dWxkIG5vdCBuZWVkIHRvIGNvbnN0cnVjdCBhIGxpbmUgcnVuIGZvciA8YnI+LgorICAgICAgICAg ICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKICAgICAgICAgICAgIGlm IChsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNMaW5lQnJlYWsoKSkKICAgICAgICAgICAg ICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlv dXRCb3goKSwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biksIGxpbmVSdW4u ZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgICAgIGVsc2Ug aWYgKGxpbmVSdW4uaXNCb3goKSB8fCBsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewotICAg ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAgICAg ICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0 cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1 bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5sb2dpY2FsTWFyZ2lu UmVjdEZvcklubGluZUxldmVsQm94KGxpbmVSdW4ubGF5b3V0Qm94KCksIGJveEdlb21ldHJ5KSwg bGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkKKyAgICAgICAgICAgICAgICAgICAg aW5saW5lQm94U3RhcnRTZXQuYWRkKCZsYXlvdXRCb3gpOworICAgICAgICAgICAgfSBlbHNlIGlm IChsaW5lUnVuLmlzSW5saW5lQm94RW5kKCkpCisgICAgICAgICAgICAgICAgaW5saW5lQm94RW5k U2V0LmFkZCgmbGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgfQogICAgIH07CiAgICAgY29uc3RydWN0TGlu ZVJ1bnMoKTsKQEAgLTQ0MSw0MyArNDQ4LDUzIEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAg ICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBhdXRv JiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwot ICAgICAgICAgICAgLy8gSW5saW5lIGJveCBjb29yZGluYXRlcyBhcmUgcmVsYXRpdmUgdG8gdGhl IGxpbmUgYm94LgotICAgICAgICAgICAgLy8gTGV0J3MgY29udmVydCB0b3AvbGVmdCByZWxhdGl2 ZSB0byB0aGUgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QuCi0gICAgICAgICAgICBhdXRvIGxvZ2lj YWxNYXJnaW5SZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94 KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAgICAgLy8gSW5saW5lIGxldmVsIGJv eCBoZWlnaHQgaW5jbHVkZXMgdGhlIG1hcmdpbiBib3guIExldCdzIGFjY291bnQgZm9yIHRoYXQu Ci0gICAgICAgICAgICBhdXRvIGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0ID0gbGluZUJveExvZ2lj YWxSZWN0LnRvcExlZnQoKTsKLSAgICAgICAgICAgIGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0Lm1v dmUobG9naWNhbE1hcmdpblJlY3QubGVmdCgpICsgYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwg bG9naWNhbE1hcmdpblJlY3QudG9wKCkgKyBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSk7Ci0K LSAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbkZsb3dQb3NpdGlvbmVkKCkpCi0gICAgICAg ICAgICAgICAgYm9yZGVyQm94TG9naWNhbFRvcExlZnQgKz0gZ2VvbWV0cnkuaW5GbG93UG9zaXRp b25lZFBvc2l0aW9uT2Zmc2V0KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLQog ICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkpIHsKKyAg ICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxNYXJnaW5SZWN0ID0gbGluZUJveC5sb2dpY2FsTWFy Z2luUmVjdEZvcklubGluZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOworICAgICAg ICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRvcExlZnQgPSBsaW5lQm94TG9naWNhbFJl Y3QudG9wTGVmdCgpOworICAgICAgICAgICAgICAgIGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0Lm1v dmUobG9naWNhbE1hcmdpblJlY3QubGVmdCgpICsgYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwg bG9naWNhbE1hcmdpblJlY3QudG9wKCkgKyBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSk7CisK KyAgICAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5GbG93UG9zaXRpb25lZCgpKQorICAg ICAgICAgICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCArPSBnZW9tZXRyeS5pbkZs b3dQb3NpdGlvbmVkUG9zaXRpb25PZmZzZXQobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMpOwogICAgICAgICAgICAgICAgIC8vIEF0b21pYyBpbmxpbmUgYm94ZXMgYXJlIGFsbCBzZXQu IFRoZWlyIG1hcmdpbi9ib3JkZXIvY29udGVudCBib3ggZ2VvbWV0cmllcyBhcmUgYWxyZWFkeSBj b21wdXRlZC4gV2UganVzdCBoYXZlIHRvIHBvc2l0aW9uIHRoZW0gaGVyZS4KICAgICAgICAgICAg ICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJvcmRlckJv eExvZ2ljYWxUb3BMZWZ0KSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICAvLyBGSVhNRTogQ2hlY2sgaWYgdGhpcyBpcyBhIG11bHRpIGxpbmUg aW5saW5lIGJveCBhbmQgd2hldGhlciBob3Jpem9udGFsIG1hcmdpbi9wYWRkaW5nL2JvcmRlciBz aG91bGQgYmUgaW5jbHVkZWQuCi0gICAgICAgICAgICBhdXRvIGNvbnRlbnRCb3hIZWlnaHQgPSB0 b0xheW91dFVuaXQobG9naWNhbE1hcmdpblJlY3QuaGVpZ2h0KCkgLSBib3hHZW9tZXRyeS52ZXJ0 aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSk7CiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94 LmlzTGluZUJyZWFrQm94KCkpIHsKLSAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dp Y2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7Ci0gICAg ICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodChjb250ZW50Qm94SGVp Z2h0KTsKKyAgICAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveFJlY3QgPSBsaW5lQm94Lmxv Z2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7 CisgICAgICAgICAgICAgICAgbGluZUJyZWFrQm94UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxS ZWN0LnRvcExlZnQoKSk7CisgICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRv cExlZnQodG9MYXlvdXRQb2ludChsaW5lQnJlYWtCb3hSZWN0LnRvcExlZnQoKSkpOworICAgICAg ICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQodG9MYXlvdXRVbml0KGxp bmVCcmVha0JveFJlY3QuaGVpZ2h0KCkpKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIGF1dG8gbWFyZ2luQm94V2lkdGggPSBsb2dpY2FsTWFy Z2luUmVjdC53aWR0aCgpOwotICAgICAgICAgICAgYXV0byBjb250ZW50Qm94V2lkdGggPSB0b0xh eW91dFVuaXQobWFyZ2luQm94V2lkdGggLSBib3hHZW9tZXRyeS5ob3Jpem9udGFsTWFyZ2luQm9y ZGVyQW5kUGFkZGluZygpKTsKLSAgICAgICAgICAgIC8vIE5vbi1hdG9taWMgaW5saW5lIGxldmVs IGJveGVzIG1heSBvciBtYXkgbm90IGJlIHdyYXBwZWQgYW5kIGhhdmUgZ2VvbWV0cmllcyBvbiBt dWx0aXBsZSBsaW5lcy4KLSAgICAgICAgICAgIGludCBwcmV2aW91c0xpbmVJbmRleCA9IGZvcm1h dHRpbmdTdGF0ZS5saW5lQm94ZXMoKS5zaXplKCkgLSAyOwotICAgICAgICAgICAgYXV0byBpc1Nw YW5uaW5nSW5saW5lQm94ID0gcHJldmlvdXNMaW5lSW5kZXggPiAwICYmIGZvcm1hdHRpbmdTdGF0 ZS5saW5lQm94ZXMoKVtwcmV2aW91c0xpbmVJbmRleF0uY29udGFpbnNJbmxpbmVMZXZlbEJveChs YXlvdXRCb3gpOwotICAgICAgICAgICAgaWYgKCFpc1NwYW5uaW5nSW5saW5lQm94KSB7Ci0gICAg ICAgICAgICAgICAgLy8gVGhpcyBib3ggc2hvd2VkIHVwIG9uIHRoaXMgbGluZSB0aGUgZmlyc3Qg dGltZS4KLSAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xh eW91dFBvaW50KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CisgICAgICAgICAgICBBU1NFUlQo bGF5b3V0Qm94LmlzSW5saW5lQm94KCkpOworICAgICAgICAgICAgLy8gSW5saW5lIGJveGVzIG1h eSBvciBtYXkgbm90IGJlIHdyYXBwZWQgYW5kIGhhdmUgcnVucyBvbiBtdWx0aXBsZSBsaW5lcyAo ZS5nLiA8c3Bhbj5maXJzdCBsaW5lPGJyPnNlY29uZCBsaW5lPGJyPnRoaXJkIGxpbmU8L3NwYW4+ KQorICAgICAgICAgICAgLy8gSW5saW5lIGJveCBjb29yZGluYXRlcyBhcmUgcmVsYXRpdmUgdG8g dGhlIGxpbmUgYm94LiBMZXQncyBjb252ZXJ0IHRvcC9sZWZ0IHJlbGF0aXZlIHRvIHRoZSBmb3Jt YXR0aW5nIGNvbnRleHQgcm9vdC4KKyAgICAgICAgICAgIGF1dG8gaW5saW5lQm94TWFyZ2luUmVj dCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gs IGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBSZWN0IHsgTGF5 b3V0UG9pbnQgeyBpbmxpbmVCb3hNYXJnaW5SZWN0LnRvcExlZnQoKSB9LCBMYXlvdXRTaXplIHsg aW5saW5lQm94TWFyZ2luUmVjdC5zaXplKCkgfSB9OworICAgICAgICAgICAgbG9naWNhbFJlY3Qu bW92ZUJ5KExheW91dFBvaW50IHsgbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSB9KTsKKyAg ICAgICAgICAgIGlmIChpbmxpbmVCb3hTdGFydFNldC5jb250YWlucygmbGF5b3V0Qm94KSkgewor ICAgICAgICAgICAgICAgIC8vIFRoaXMgaW5saW5lIGJveCBzaG93ZWQgdXAgZmlyc3Qgb24gdGhp cyBsaW5lLgorICAgICAgICAgICAgICAgIGxvZ2ljYWxSZWN0Lm1vdmVIb3Jpem9udGFsbHkoYm94 R2VvbWV0cnkubWFyZ2luU3RhcnQoKSk7CisgICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0 TG9naWNhbFRvcExlZnQobG9naWNhbFJlY3QudG9wTGVmdCgpKTsKKyAgICAgICAgICAgICAgICBi b3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGxvZ2ljYWxSZWN0LmhlaWdodCgpKTsKKyAg ICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRCb3hXaWR0aCA9IGxvZ2ljYWxSZWN0LndpZHRoKCk7 CisgICAgICAgICAgICAgICAgaWYgKGlubGluZUJveEVuZFNldC5jb250YWlucygmbGF5b3V0Qm94 KSkgeworICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIGEgc2luZ2xlIGxpbmUgaW5saW5l IGJveC4KKyAgICAgICAgICAgICAgICAgICAgY29udGVudEJveFdpZHRoIC09IHN0ZDo6bWF4KDBf bHUsIGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkpICsgc3RkOjptYXgoMF9sdSwgYm94R2VvbWV0 cnkubWFyZ2luRW5kKCkpOworICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAg ICAgICBjb250ZW50Qm94V2lkdGggLT0gc3RkOjptYXgoMF9sdSwgYm94R2VvbWV0cnkubWFyZ2lu U3RhcnQoKSk7CiAgICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRo KGNvbnRlbnRCb3hXaWR0aCk7Ci0gICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVu dEJveEhlaWdodChjb250ZW50Qm94SGVpZ2h0KTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBqdXN0IGEgc2ltcGxlIGJv eCBnZW9tZXRyeSBmb3IgdGhlIGxpbmUgc3Bhbm5pbmcgaW5saW5lIGJveC4gZ2V0Qm91bmRpbmdD bGllbnRSZWN0IGxvb2tzIGludG8gZWFjaCBsaW5lIGJveGVzICh3aWxsIHR1cm4gaW50byBmcmFn bWVudGVkIGJveGVzKS4KLSAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxMZWZ0KHN0 ZDo6bWluKEJveEdlb21ldHJ5Ojpib3JkZXJCb3hMZWZ0KGJveEdlb21ldHJ5KSwgdG9MYXlvdXRV bml0KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0LngoKSkpKTsKLSAgICAgICAgICAgIGJveEdlb21l dHJ5LnNldENvbnRlbnRCb3hXaWR0aChzdGQ6Om1heChjb250ZW50Qm94V2lkdGgsIGJveEdlb21l dHJ5LmNvbnRlbnRCb3hXaWR0aCgpKSk7Ci0gICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250 ZW50Qm94SGVpZ2h0KGJveEdlb21ldHJ5LmNvbnRlbnRCb3hIZWlnaHQoKSArIGNvbnRlbnRCb3hI ZWlnaHQpOworICAgICAgICAgICAgLy8gTWlkZGxlIG9yIGVuZCBvZiB0aGUgaW5saW5lIGJveC4g TGV0J3Mgc3RyZXRjaCB0aGUgYm94IGFzIG5lZWRlZC4KKyAgICAgICAgICAgIGxvZ2ljYWxSZWN0 LmV4cGFuZEhvcml6b250YWxseSgtc3RkOjptYXgoMF9sdSwgYm94R2VvbWV0cnkubWFyZ2luRW5k KCkpKTsKKworICAgICAgICAgICAgYXV0byBlbmNsb3NpbmdSZWN0ID0gUmVjdCB7IEJveEdlb21l dHJ5Ojpib3JkZXJCb3hUb3BMZWZ0KGJveEdlb21ldHJ5KSwgYm94R2VvbWV0cnkuY29udGVudEJv eCgpLnNpemUoKSB9OworICAgICAgICAgICAgZW5jbG9zaW5nUmVjdC5leHBhbmRUb0NvbnRhaW4o bG9naWNhbFJlY3QpOworCisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsTGVmdChl bmNsb3NpbmdSZWN0LmxlZnQoKSk7CisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50 Qm94SGVpZ2h0KGVuY2xvc2luZ1JlY3QuaGVpZ2h0KCkpOworICAgICAgICAgICAgYm94R2VvbWV0 cnkuc2V0Q29udGVudEJveFdpZHRoKGVuY2xvc2luZ1JlY3Qud2lkdGgoKSk7CiAgICAgICAgIH0K ICAgICB9OwogICAgIHVwZGF0ZUJveEdlb21ldHJ5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwCmluZGV4IDdiY2I2OWJlOGM4Yzk0Y2NkOWFjMjZiNDg2NzJlZGE5MGQ3YThiNDUu LjQwNjMxNGZjZGU5NTFkNDBiODAwMTVmZmY0MDAyNGY3N2VkOTkyYmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0zNTYsMTUgKzM1Niw4IEBAIExheW91dFJlY3QgTGlu ZUxheW91dDo6ZW5jbG9zaW5nQm9yZGVyQm94UmVjdEZvcihjb25zdCBSZW5kZXJJbmxpbmUmIHJl bmRlcklubGluCiAgICAgaWYgKCFtX2lubGluZUNvbnRlbnQpCiAgICAgICAgIHJldHVybiB7IH07 CiAKLSAgICBhdXRvJiBsYXlvdXRCb3ggPSBtX2JveFRyZWUubGF5b3V0Qm94Rm9yUmVuZGVyZXIo cmVuZGVySW5saW5lKTsKLQotICAgIExheW91dFJlY3QgcmVjdDsKLSAgICBmb3IgKGF1dG8mIGlu bGluZUJveCA6IG1faW5saW5lQ29udGVudC0+aW5saW5lQm94ZXMpIHsKLSAgICAgICAgaWYgKCZp bmxpbmVCb3gubGF5b3V0Qm94KCkgPT0gJmxheW91dEJveCkKLSAgICAgICAgICAgIHJlY3QudW5p dGVJZk5vblplcm8oTGF5b3V0UmVjdChpbmxpbmVCb3gucmVjdCgpKSk7Ci0gICAgfQotCi0gICAg cmV0dXJuIHJlY3Q7CisgICAgYXV0byBib3hHZW9tZXRyeSA9IG1faW5saW5lRm9ybWF0dGluZ1N0 YXRlLmJveEdlb21ldHJ5KG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihyZW5kZXJJbmxp bmUpKTsKKyAgICByZXR1cm4geyBMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJCb3hUb3BMZWZ0 KGJveEdlb21ldHJ5KSwgYm94R2VvbWV0cnkuY29udGVudEJveCgpLnNpemUoKSB9OwogfQogCiBj b25zdCBSZW5kZXJPYmplY3QmIExpbmVMYXlvdXQ6OnJlbmRlcmVyRm9yTGF5b3V0Qm94KGNvbnN0 IExheW91dDo6Qm94JiBsYXlvdXRCb3gpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRHZW9tZXRyeVJlY3QuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9sYXlvdXR0cmVlL0xheW91dEdlb21ldHJ5UmVjdC5oCmluZGV4IGFiYWUxMTVlMDYz MDBhZDk1MjkzM2NiNDA1ZjgxYTgwMWNiNTk0MmIuLmU1MTZlM2RkNDA1MzY3MWM5NmNlZWQ1ODBj MDAyMDFjNjhhNDQ3YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEdlb21ldHJ5UmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dEdlb21ldHJ5UmVjdC5oCkBAIC02NiwxMCArNjYsMTIgQEAgcHVibGljOgog CiAgICAgdm9pZCBtb3ZlSG9yaXpvbnRhbGx5KExheW91dFVuaXQpOwogICAgIHZvaWQgbW92ZVZl cnRpY2FsbHkoTGF5b3V0VW5pdCk7CisgICAgdm9pZCBtb3ZlQnkoTGF5b3V0UG9pbnQpOwogCiAg ICAgdm9pZCBleHBhbmQoT3B0aW9uYWw8TGF5b3V0VW5pdD4sIE9wdGlvbmFsPExheW91dFVuaXQ+ KTsKICAgICB2b2lkIGV4cGFuZEhvcml6b250YWxseShMYXlvdXRVbml0IGRlbHRhKSB7IGV4cGFu ZChkZWx0YSwgeyB9KTsgfQogICAgIHZvaWQgZXhwYW5kVmVydGljYWxseShMYXlvdXRVbml0IGRl bHRhKSB7IGV4cGFuZCh7IH0sIGRlbHRhKTsgfQorICAgIHZvaWQgZXhwYW5kVG9Db250YWluKGNv bnN0IFJlY3QmKTsKICAgICBib29sIGludGVyc2VjdHMoY29uc3QgUmVjdCYgcmVjdCkgY29uc3Qg eyByZXR1cm4gbV9yZWN0LmludGVyc2VjdHMocmVjdCk7IH0KIAogICAgIFJlY3QgY2xvbmUoKSBj b25zdDsKQEAgLTI3Nyw2ICsyNzksMTMgQEAgaW5saW5lIHZvaWQgUmVjdDo6bW92ZVZlcnRpY2Fs bHkoTGF5b3V0VW5pdCBvZmZzZXQpCiAgICAgbV9yZWN0Lm1vdmUoTGF5b3V0U2l6ZSB7IDAsIG9m ZnNldCB9KTsKIH0KIAoraW5saW5lIHZvaWQgUmVjdDo6bW92ZUJ5KExheW91dFBvaW50IG9mZnNl dCkKK3sKKyAgICBBU1NFUlQobV9oYXNWYWxpZFRvcCk7CisgICAgQVNTRVJUKG1faGFzVmFsaWRM ZWZ0KTsKKyAgICBtX3JlY3QubW92ZUJ5KG9mZnNldCk7Cit9CisKIGlubGluZSB2b2lkIFJlY3Q6 OmV4cGFuZChPcHRpb25hbDxMYXlvdXRVbml0PiB3aWR0aCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4g aGVpZ2h0KQogewogICAgIEFTU0VSVCghd2lkdGggfHwgbV9oYXNWYWxpZFdpZHRoKTsKQEAgLTI4 NCw2ICsyOTMsMTMgQEAgaW5saW5lIHZvaWQgUmVjdDo6ZXhwYW5kKE9wdGlvbmFsPExheW91dFVu aXQ+IHdpZHRoLCBPcHRpb25hbDxMYXlvdXRVbml0PiBoZWlnaHQKICAgICBtX3JlY3QuZXhwYW5k KHdpZHRoLnZhbHVlT3IoMCksIGhlaWdodC52YWx1ZU9yKDApKTsKIH0KIAoraW5saW5lIHZvaWQg UmVjdDo6ZXhwYW5kVG9Db250YWluKGNvbnN0IFJlY3QmIHJlY3QpCit7CisgICAgQVNTRVJUKG1f aGFzVmFsaWRXaWR0aCk7CisgICAgQVNTRVJUKG1faGFzVmFsaWRIZWlnaHQpOworICAgIG1fcmVj dC51bml0ZShyZWN0KTsKK30KKwogaW5saW5lIFJlY3QgUmVjdDo6Y2xvbmUoKSBjb25zdAogewog ICAgIFJlY3QgcmVjdDsK 415516 2020-12-06 07:44:22 -0800 2020-12-06 10:58:38 -0800 Patch bug-219574-20201206074421.patch text/plain 12518 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ1NzI0NTdhZmNjNjNk MmRiZjU5Mjg1YmQ2ZWFjOWIyMzc0YzE2Mi4uNThiNmNlMDU1ZDk5YzdmYjUwNTI1MDczMjBhNmY1 ZDViZWIzMjFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBCb3hHZW9t ZXRyeSBzaG91bGQgcHJvdmlkZSBhbiBlbmNsb3NpbmcgcmVjdCBmb3IgbXVsdGlsaW5lIGlubGlu ZSBib3hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE5NTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAg VGhpcyBwYXRjaCBhZGQgc3VwcG9ydCBmb3IgbXVsdGlsaW5lIGlubGluZSBib3ggZ2VvbWV0cnkg KGUuZy4gPHNwYW4+Zmlyc3Q8YnI+c2Vjb25kPC9zcGFuPikKKyAgICAgICAgSW4gc3VjaCBjYXNl cyB3ZSB0dXJuIHRoZSBjb250ZW50IGJveCBpbnRvIHRoZSBlbmNsb3NpbmcgcmVjdCAoYm9yZGVy IGFuZCBwYWRkaW5nIGRvIG5vdCBtYWtlIHRvbyBtdWNoIHNlbnNlIGluIG11bHRpbGluZSBjYXNl KQorICAgICAgICBUaGlzIGlzIG5vdCB0byBiZSBjb25mdXNlZCB3aXRoIEVsZW1lbnQuZ2V0Q2xp ZW50UmVjdHMoKSB3aGljaCByZXR1cm5zIGEgbGlzdCBvZiByZWN0cyB3aGVyZSBib3JkZXIgYW5k IHBhZGRpbmcgc3RhcnQgbWFraW5nIHNlbnNlLiAKKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KToKKyAgICAgICAgc2V0IHRoZSBib3ggZ2VvbWV0cnkgZGVwZW5kaW5nIG9uIHdoZXRo ZXIgdGhpcyBpcyB0aGUgZmlyc3QgbGluZSB3aGVyZSB0aGUgaW5saW5lIGJveCBzaG93cyBvciB3 ZSBhcmUgcHJvY2Vzc2luZyBhbiBpbi1iZXR3ZWVuIG9yIGVuZCBsaW5lLgorCisgICAgICAgICog bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6ZW5jbG9zaW5nQm9y ZGVyQm94UmVjdEZvciBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0 R2VvbWV0cnlSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlJlY3Q6Om1vdmVCeSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlJlY3Q6OmV4cGFuZFRvQ29udGFpbik6CisKIDIw MjAtMTItMDQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJbnRlZ3JhdGlvbl0gRG8gbm90IGNvbnN0cnVjdCBhIG5ldyBsYXlvdXQgYm94IGZvciBldmVy eSBpbmxpbmUgYm94IGVuZCAoSW5saW5lV2Fsa2VyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCmluZGV4IGExZWNmNGEwYmI4NzUxNWFiM2E1NDlhZDlhNmExYTBjNWVlN2E5YWIu LjkwZTM0ZDZiZGUyYzdiYmMwNDMyMTk2ZWU0ODgwM2MyMTM0ODVmYWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQxNCwxOSArNDE0LDI2IEBAIElubGluZVJlY3Qg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNv bnN0IExpbmVCdWlsCiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goZ2VvbWV0cnkubGlu ZUJveEZvckxpbmVDb250ZW50KGxpbmVDb250ZW50KSk7CiAgICAgY29uc3QgYXV0byYgbGluZUJv eCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lQm94ZXMoKS5sYXN0KCk7CiAgICAgYXV0byYgbGluZUJv eExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdCgpOworICAgIEhhc2hTZXQ8Y29uc3Qg Qm94Kj4gaW5saW5lQm94U3RhcnRTZXQ7CisgICAgSGFzaFNldDxjb25zdCBCb3gqPiBpbmxpbmVC b3hFbmRTZXQ7CiAKICAgICBhdXRvIGNvbnN0cnVjdExpbmVSdW5zID0gWyZdIHsKICAgICAgICAg YXV0byBsaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXplKCk7CiAgICAgICAg IC8vIENyZWF0ZSB0aGUgaW5saW5lIHJ1bnMgb24gdGhlIGN1cnJlbnQgbGluZS4gVGhpcyBpcyBt b3N0bHkgdGV4dCBhbmQgYXRvbWljIGlubGluZSBydW5zLgogICAgICAgICBmb3IgKGF1dG8mIGxp bmVSdW4gOiBsaW5lQ29udGVudC5ydW5zKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hv dWxkIG5vdCBuZWVkIHRvIGNvbnN0cnVjdCBhIGxpbmUgcnVuIGZvciA8YnI+LgorICAgICAgICAg ICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKICAgICAgICAgICAgIGlm IChsaW5lUnVuLmlzVGV4dCgpIHx8IGxpbmVSdW4uaXNMaW5lQnJlYWsoKSkKICAgICAgICAgICAg ICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlv dXRCb3goKSwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biksIGxpbmVSdW4u ZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgICAgIGVsc2Ug aWYgKGxpbmVSdW4uaXNCb3goKSB8fCBsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewotICAg ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAgICAg ICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0 cnkobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1 bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5sb2dpY2FsTWFyZ2lu UmVjdEZvcklubGluZUxldmVsQm94KGxpbmVSdW4ubGF5b3V0Qm94KCksIGJveEdlb21ldHJ5KSwg bGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkKKyAgICAgICAgICAgICAgICAgICAg aW5saW5lQm94U3RhcnRTZXQuYWRkKCZsYXlvdXRCb3gpOworICAgICAgICAgICAgfSBlbHNlIGlm IChsaW5lUnVuLmlzSW5saW5lQm94RW5kKCkpCisgICAgICAgICAgICAgICAgaW5saW5lQm94RW5k U2V0LmFkZCgmbGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBB U1NFUlQobGluZVJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkpOwogICAgICAgICB9CiAgICAg fTsKICAgICBjb25zdHJ1Y3RMaW5lUnVucygpOwpAQCAtNDQxLDQzICs0NDgsNTMgQEAgSW5saW5l UmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRl bnQoY29uc3QgTGluZUJ1aWwKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdl b21ldHJ5KGxheW91dEJveCk7Ci0gICAgICAgICAgICAvLyBJbmxpbmUgYm94IGNvb3JkaW5hdGVz IGFyZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3guCi0gICAgICAgICAgICAvLyBMZXQncyBjb252 ZXJ0IHRvcC9sZWZ0IHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdC4KLSAg ICAgICAgICAgIGF1dG8gbG9naWNhbE1hcmdpblJlY3QgPSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5S ZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAg ICAvLyBJbmxpbmUgbGV2ZWwgYm94IGhlaWdodCBpbmNsdWRlcyB0aGUgbWFyZ2luIGJveC4gTGV0 J3MgYWNjb3VudCBmb3IgdGhhdC4KLSAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TG9naWNhbFRv cExlZnQgPSBsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpOwotICAgICAgICAgICAgYm9yZGVy Qm94TG9naWNhbFRvcExlZnQubW92ZShsb2dpY2FsTWFyZ2luUmVjdC5sZWZ0KCkgKyBib3hHZW9t ZXRyeS5tYXJnaW5TdGFydCgpLCBsb2dpY2FsTWFyZ2luUmVjdC50b3AoKSArIGJveEdlb21ldHJ5 Lm1hcmdpbkJlZm9yZSgpKTsKLQotICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0luRmxvd1Bv c2l0aW9uZWQoKSkKLSAgICAgICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCArPSBn ZW9tZXRyeS5pbkZsb3dQb3NpdGlvbmVkUG9zaXRpb25PZmZzZXQobGF5b3V0Qm94LCBob3Jpem9u dGFsQ29uc3RyYWludHMpOwotCiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzQXRvbWljSW5s aW5lTGV2ZWxCb3goKSkgeworICAgICAgICAgICAgICAgIGF1dG8gbG9naWNhbE1hcmdpblJlY3Qg PSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94LCBi b3hHZW9tZXRyeSk7CisgICAgICAgICAgICAgICAgYXV0byBib3JkZXJCb3hMb2dpY2FsVG9wTGVm dCA9IGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCk7CisgICAgICAgICAgICAgICAgYm9yZGVy Qm94TG9naWNhbFRvcExlZnQubW92ZShsb2dpY2FsTWFyZ2luUmVjdC5sZWZ0KCkgKyBib3hHZW9t ZXRyeS5tYXJnaW5TdGFydCgpLCBsb2dpY2FsTWFyZ2luUmVjdC50b3AoKSArIGJveEdlb21ldHJ5 Lm1hcmdpbkJlZm9yZSgpKTsKKworICAgICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbkZs b3dQb3NpdGlvbmVkKCkpCisgICAgICAgICAgICAgICAgICAgIGJvcmRlckJveExvZ2ljYWxUb3BM ZWZ0ICs9IGdlb21ldHJ5LmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9mZnNldChsYXlvdXRCb3gs IGhvcml6b250YWxDb25zdHJhaW50cyk7CiAgICAgICAgICAgICAgICAgLy8gQXRvbWljIGlubGlu ZSBib3hlcyBhcmUgYWxsIHNldC4gVGhlaXIgbWFyZ2luL2JvcmRlci9jb250ZW50IGJveCBnZW9t ZXRyaWVzIGFyZSBhbHJlYWR5IGNvbXB1dGVkLiBXZSBqdXN0IGhhdmUgdG8gcG9zaXRpb24gdGhl bSBoZXJlLgogICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRv TGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayBpZiB0 aGlzIGlzIGEgbXVsdGkgbGluZSBpbmxpbmUgYm94IGFuZCB3aGV0aGVyIGhvcml6b250YWwgbWFy Z2luL3BhZGRpbmcvYm9yZGVyIHNob3VsZCBiZSBpbmNsdWRlZC4KLSAgICAgICAgICAgIGF1dG8g Y29udGVudEJveEhlaWdodCA9IHRvTGF5b3V0VW5pdChsb2dpY2FsTWFyZ2luUmVjdC5oZWlnaHQo KSAtIGJveEdlb21ldHJ5LnZlcnRpY2FsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpKTsKICAgICAg ICAgICAgIGlmIChsYXlvdXRCb3guaXNMaW5lQnJlYWtCb3goKSkgewotICAgICAgICAgICAgICAg IGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9n aWNhbFRvcExlZnQpKTsKLSAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94 SGVpZ2h0KGNvbnRlbnRCb3hIZWlnaHQpOworICAgICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFr Qm94UmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlv dXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICBsaW5lQnJlYWtCb3hSZWN0Lm1v dmVCeShsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpKTsKKyAgICAgICAgICAgICAgICBib3hH ZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGxpbmVCcmVha0JveFJlY3Qu dG9wTGVmdCgpKSk7CisgICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhl aWdodCh0b0xheW91dFVuaXQobGluZUJyZWFrQm94UmVjdC5oZWlnaHQoKSkpOworICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBtYXJnaW5C b3hXaWR0aCA9IGxvZ2ljYWxNYXJnaW5SZWN0LndpZHRoKCk7Ci0gICAgICAgICAgICBhdXRvIGNv bnRlbnRCb3hXaWR0aCA9IHRvTGF5b3V0VW5pdChtYXJnaW5Cb3hXaWR0aCAtIGJveEdlb21ldHJ5 Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwotICAgICAgICAgICAgLy8gTm9u LWF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgbWF5IG9yIG1heSBub3QgYmUgd3JhcHBlZCBhbmQg aGF2ZSBnZW9tZXRyaWVzIG9uIG11bHRpcGxlIGxpbmVzLgotICAgICAgICAgICAgaW50IHByZXZp b3VzTGluZUluZGV4ID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLnNpemUoKSAtIDI7Ci0g ICAgICAgICAgICBhdXRvIGlzU3Bhbm5pbmdJbmxpbmVCb3ggPSBwcmV2aW91c0xpbmVJbmRleCA+ IDAgJiYgZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpW3ByZXZpb3VzTGluZUluZGV4XS5jb250 YWluc0lubGluZUxldmVsQm94KGxheW91dEJveCk7Ci0gICAgICAgICAgICBpZiAoIWlzU3Bhbm5p bmdJbmxpbmVCb3gpIHsKLSAgICAgICAgICAgICAgICAvLyBUaGlzIGJveCBzaG93ZWQgdXAgb24g dGhpcyBsaW5lIHRoZSBmaXJzdCB0aW1lLgotICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNl dExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsK KyAgICAgICAgICAgIEFTU0VSVChsYXlvdXRCb3guaXNJbmxpbmVCb3goKSk7CisgICAgICAgICAg ICAvLyBJbmxpbmUgYm94ZXMgbWF5IG9yIG1heSBub3QgYmUgd3JhcHBlZCBhbmQgaGF2ZSBydW5z IG9uIG11bHRpcGxlIGxpbmVzIChlLmcuIDxzcGFuPmZpcnN0IGxpbmU8YnI+c2Vjb25kIGxpbmU8 YnI+dGhpcmQgbGluZTwvc3Bhbj4pCisgICAgICAgICAgICAvLyBJbmxpbmUgYm94IGNvb3JkaW5h dGVzIGFyZSByZWxhdGl2ZSB0byB0aGUgbGluZSBib3guIExldCdzIGNvbnZlcnQgdG9wL2xlZnQg cmVsYXRpdmUgdG8gdGhlIGZvcm1hdHRpbmcgY29udGV4dCByb290LgorICAgICAgICAgICAgYXV0 byBpbmxpbmVCb3hNYXJnaW5SZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGlu ZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAgYXV0byBsb2dp Y2FsUmVjdCA9IFJlY3QgeyBMYXlvdXRQb2ludCB7IGlubGluZUJveE1hcmdpblJlY3QudG9wTGVm dCgpIH0sIExheW91dFNpemUgeyBpbmxpbmVCb3hNYXJnaW5SZWN0LnNpemUoKSB9IH07CisgICAg ICAgICAgICBsb2dpY2FsUmVjdC5tb3ZlQnkoTGF5b3V0UG9pbnQgeyBsaW5lQm94TG9naWNhbFJl Y3QudG9wTGVmdCgpIH0pOworICAgICAgICAgICAgaWYgKGlubGluZUJveFN0YXJ0U2V0LmNvbnRh aW5zKCZsYXlvdXRCb3gpKSB7CisgICAgICAgICAgICAgICAgLy8gVGhpcyBpbmxpbmUgYm94IHNo b3dlZCB1cCBmaXJzdCBvbiB0aGlzIGxpbmUuCisgICAgICAgICAgICAgICAgbG9naWNhbFJlY3Qu bW92ZUhvcml6b250YWxseShib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpKTsKKyAgICAgICAgICAg ICAgICBib3hHZW9tZXRyeS5zZXRMb2dpY2FsVG9wTGVmdChsb2dpY2FsUmVjdC50b3BMZWZ0KCkp OworICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQobG9naWNh bFJlY3QuaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIGF1dG8gY29udGVudEJveFdpZHRoID0g bG9naWNhbFJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgICAgICBpZiAoaW5saW5lQm94RW5kU2V0 LmNvbnRhaW5zKCZsYXlvdXRCb3gpKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIFRoaXMgaXMg YSBzaW5nbGUgbGluZSBpbmxpbmUgYm94LgorICAgICAgICAgICAgICAgICAgICBjb250ZW50Qm94 V2lkdGggLT0gc3RkOjptYXgoMF9sdSwgYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSkgKyBzdGQ6 Om1heCgwX2x1LCBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKSk7CisgICAgICAgICAgICAgICAgfSBl bHNlCisgICAgICAgICAgICAgICAgICAgIGNvbnRlbnRCb3hXaWR0aCAtPSBzdGQ6Om1heCgwX2x1 LCBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpKTsKICAgICAgICAgICAgICAgICBib3hHZW9tZXRy eS5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudEJveFdpZHRoKTsKLSAgICAgICAgICAgICAgICBi b3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGNvbnRlbnRCb3hIZWlnaHQpOwogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8gVGhpcyBp cyBhIGp1c3QgYSBzaW1wbGUgYm94IGdlb21ldHJ5IGZvciB0aGUgbGluZSBzcGFubmluZyBpbmxp bmUgYm94LiBnZXRCb3VuZGluZ0NsaWVudFJlY3QgbG9va3MgaW50byBlYWNoIGxpbmUgYm94ZXMg KHdpbGwgdHVybiBpbnRvIGZyYWdtZW50ZWQgYm94ZXMpLgotICAgICAgICAgICAgYm94R2VvbWV0 cnkuc2V0TG9naWNhbExlZnQoc3RkOjptaW4oQm94R2VvbWV0cnk6OmJvcmRlckJveExlZnQoYm94 R2VvbWV0cnkpLCB0b0xheW91dFVuaXQoYm9yZGVyQm94TG9naWNhbFRvcExlZnQueCgpKSkpOwot ICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveFdpZHRoKHN0ZDo6bWF4KGNvbnRl bnRCb3hXaWR0aCwgYm94R2VvbWV0cnkuY29udGVudEJveFdpZHRoKCkpKTsKLSAgICAgICAgICAg IGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoYm94R2VvbWV0cnkuY29udGVudEJveEhl aWdodCgpICsgY29udGVudEJveEhlaWdodCk7CisgICAgICAgICAgICAvLyBNaWRkbGUgb3IgZW5k IG9mIHRoZSBpbmxpbmUgYm94LiBMZXQncyBzdHJldGNoIHRoZSBib3ggYXMgbmVlZGVkLgorICAg ICAgICAgICAgbG9naWNhbFJlY3QuZXhwYW5kSG9yaXpvbnRhbGx5KC1zdGQ6Om1heCgwX2x1LCBi b3hHZW9tZXRyeS5tYXJnaW5FbmQoKSkpOworCisgICAgICAgICAgICBhdXRvIGVuY2xvc2luZ1Jl Y3QgPSBSZWN0IHsgQm94R2VvbWV0cnk6OmJvcmRlckJveFRvcExlZnQoYm94R2VvbWV0cnkpLCBi b3hHZW9tZXRyeS5jb250ZW50Qm94KCkuc2l6ZSgpIH07CisgICAgICAgICAgICBlbmNsb3NpbmdS ZWN0LmV4cGFuZFRvQ29udGFpbihsb2dpY2FsUmVjdCk7CisKKyAgICAgICAgICAgIGJveEdlb21l dHJ5LnNldExvZ2ljYWxMZWZ0KGVuY2xvc2luZ1JlY3QubGVmdCgpKTsKKyAgICAgICAgICAgIGJv eEdlb21ldHJ5LnNldENvbnRlbnRCb3hIZWlnaHQoZW5jbG9zaW5nUmVjdC5oZWlnaHQoKSk7Cisg ICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoZW5jbG9zaW5nUmVjdC53 aWR0aCgpKTsKICAgICAgICAgfQogICAgIH07CiAgICAgdXBkYXRlQm94R2VvbWV0cnkoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5kZXggN2JjYjY5YmU4YzhjOTRjY2Q5YWMy NmI0ODY3MmVkYTkwZDdhOGI0NS4uNDA2MzE0ZmNkZTk1MWQ0MGI4MDAxNWZmZjQwMDI0Zjc3ZWQ5 OTJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAgLTM1NiwxNSArMzU2 LDggQEAgTGF5b3V0UmVjdCBMaW5lTGF5b3V0OjplbmNsb3NpbmdCb3JkZXJCb3hSZWN0Rm9yKGNv bnN0IFJlbmRlcklubGluZSYgcmVuZGVySW5saW4KICAgICBpZiAoIW1faW5saW5lQ29udGVudCkK ICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIGF1dG8mIGxheW91dEJveCA9IG1fYm94VHJlZS5s YXlvdXRCb3hGb3JSZW5kZXJlcihyZW5kZXJJbmxpbmUpOwotCi0gICAgTGF5b3V0UmVjdCByZWN0 OwotICAgIGZvciAoYXV0byYgaW5saW5lQm94IDogbV9pbmxpbmVDb250ZW50LT5pbmxpbmVCb3hl cykgewotICAgICAgICBpZiAoJmlubGluZUJveC5sYXlvdXRCb3goKSA9PSAmbGF5b3V0Qm94KQot ICAgICAgICAgICAgcmVjdC51bml0ZUlmTm9uWmVybyhMYXlvdXRSZWN0KGlubGluZUJveC5yZWN0 KCkpKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gcmVjdDsKKyAgICBhdXRvIGJveEdlb21ldHJ5ID0g bV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobV9ib3hUcmVlLmxheW91dEJveEZv clJlbmRlcmVyKHJlbmRlcklubGluZSkpOworICAgIHJldHVybiB7IExheW91dDo6Qm94R2VvbWV0 cnk6OmJvcmRlckJveFRvcExlZnQoYm94R2VvbWV0cnkpLCBib3hHZW9tZXRyeS5jb250ZW50Qm94 KCkuc2l6ZSgpIH07CiB9CiAKIGNvbnN0IFJlbmRlck9iamVjdCYgTGluZUxheW91dDo6cmVuZGVy ZXJGb3JMYXlvdXRCb3goY29uc3QgTGF5b3V0OjpCb3gmIGxheW91dEJveCkgY29uc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEdlb21ldHJ5UmVj dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0R2VvbWV0cnlSZWN0 LmgKaW5kZXggYWJhZTExNWUwNjMwMGFkOTUyOTMzY2I0MDVmODFhODAxY2I1OTQyYi4uZTUxNmUz ZGQ0MDUzNjcxYzk2Y2VlZDU4MGMwMDIwMWM2OGE0NDdhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0R2VvbWV0cnlSZWN0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0R2VvbWV0cnlSZWN0LmgKQEAgLTY2LDEw ICs2NiwxMiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIG1vdmVIb3Jpem9udGFsbHkoTGF5b3V0VW5p dCk7CiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShMYXlvdXRVbml0KTsKKyAgICB2b2lkIG1vdmVC eShMYXlvdXRQb2ludCk7CiAKICAgICB2b2lkIGV4cGFuZChPcHRpb25hbDxMYXlvdXRVbml0Piwg T3B0aW9uYWw8TGF5b3V0VW5pdD4pOwogICAgIHZvaWQgZXhwYW5kSG9yaXpvbnRhbGx5KExheW91 dFVuaXQgZGVsdGEpIHsgZXhwYW5kKGRlbHRhLCB7IH0pOyB9CiAgICAgdm9pZCBleHBhbmRWZXJ0 aWNhbGx5KExheW91dFVuaXQgZGVsdGEpIHsgZXhwYW5kKHsgfSwgZGVsdGEpOyB9CisgICAgdm9p ZCBleHBhbmRUb0NvbnRhaW4oY29uc3QgUmVjdCYpOwogICAgIGJvb2wgaW50ZXJzZWN0cyhjb25z dCBSZWN0JiByZWN0KSBjb25zdCB7IHJldHVybiBtX3JlY3QuaW50ZXJzZWN0cyhyZWN0KTsgfQog CiAgICAgUmVjdCBjbG9uZSgpIGNvbnN0OwpAQCAtMjc3LDYgKzI3OSwxMyBAQCBpbmxpbmUgdm9p ZCBSZWN0Ojptb3ZlVmVydGljYWxseShMYXlvdXRVbml0IG9mZnNldCkKICAgICBtX3JlY3QubW92 ZShMYXlvdXRTaXplIHsgMCwgb2Zmc2V0IH0pOwogfQogCitpbmxpbmUgdm9pZCBSZWN0Ojptb3Zl QnkoTGF5b3V0UG9pbnQgb2Zmc2V0KQoreworICAgIEFTU0VSVChtX2hhc1ZhbGlkVG9wKTsKKyAg ICBBU1NFUlQobV9oYXNWYWxpZExlZnQpOworICAgIG1fcmVjdC5tb3ZlQnkob2Zmc2V0KTsKK30K KwogaW5saW5lIHZvaWQgUmVjdDo6ZXhwYW5kKE9wdGlvbmFsPExheW91dFVuaXQ+IHdpZHRoLCBP cHRpb25hbDxMYXlvdXRVbml0PiBoZWlnaHQpCiB7CiAgICAgQVNTRVJUKCF3aWR0aCB8fCBtX2hh c1ZhbGlkV2lkdGgpOwpAQCAtMjg0LDYgKzI5MywxMyBAQCBpbmxpbmUgdm9pZCBSZWN0OjpleHBh bmQoT3B0aW9uYWw8TGF5b3V0VW5pdD4gd2lkdGgsIE9wdGlvbmFsPExheW91dFVuaXQ+IGhlaWdo dAogICAgIG1fcmVjdC5leHBhbmQod2lkdGgudmFsdWVPcigwKSwgaGVpZ2h0LnZhbHVlT3IoMCkp OwogfQogCitpbmxpbmUgdm9pZCBSZWN0OjpleHBhbmRUb0NvbnRhaW4oY29uc3QgUmVjdCYgcmVj dCkKK3sKKyAgICBBU1NFUlQobV9oYXNWYWxpZFdpZHRoKTsKKyAgICBBU1NFUlQobV9oYXNWYWxp ZEhlaWdodCk7CisgICAgbV9yZWN0LnVuaXRlKHJlY3QpOworfQorCiBpbmxpbmUgUmVjdCBSZWN0 OjpjbG9uZSgpIGNvbnN0CiB7CiAgICAgUmVjdCByZWN0Owo=