217023 2020-09-26 20:16:10 -0700 [LFC][IFC] Create inline boxes for hard line breaks(<br>) and word wrap opportunities (<wbr>) 2020-09-27 11:42:16 -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 1692279 0 zalan 2020-09-26 20:16:10 -0700 so that we can add computed box geometries for them. 1692286 1 409808 zalan 2020-09-26 20:44:46 -0700 Created attachment 409808 Patch 1692291 2 409811 zalan 2020-09-26 21:29:30 -0700 Created attachment 409811 Patch 1692342 3 ews-feeder 2020-09-27 06:03:33 -0700 Committed r267657: <https://trac.webkit.org/changeset/267657> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409811. 1692343 4 webkit-bug-importer 2020-09-27 06:04:18 -0700 <rdar://problem/69654918> 1692394 5 zalan 2020-09-27 09:07:57 -0700 Reopening to attach new patch. 1692395 6 409837 zalan 2020-09-27 09:07:58 -0700 Created attachment 409837 Patch 1692397 7 ews-feeder 2020-09-27 09:30:59 -0700 Committed r267666: <https://trac.webkit.org/changeset/267666> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409837. 1692415 8 409811 simon.fraser 2020-09-27 10:47:49 -0700 Comment on attachment 409811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409811&action=review > Source/WebCore/layout/FormattingState.cpp:55 > + // Anonymous text wrappers do not need display boxes. You mean "do not need box geometry"? This is not about Display::Box. 1692424 9 zalan 2020-09-27 11:42:16 -0700 (In reply to Simon Fraser (smfr) from comment #8) > Comment on attachment 409811 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=409811&action=review > > > Source/WebCore/layout/FormattingState.cpp:55 > > + // Anonymous text wrappers do not need display boxes. > > You mean "do not need box geometry"? This is not about Display::Box. Yeah, you are right. I should have rephrased it (this comment is from before when box geometry was really just a Display::Box) 409808 2020-09-26 20:44:46 -0700 2020-09-26 21:44:57 -0700 Patch bug-217023-20200926204446.patch text/plain 14148 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcxMGZmZDNiMzk3OGIx MGMyZDg2ZDYyZWE3N2ZmOWNiYTc5ODY1NS4uZDhmOGI2MDk0NmIyM2JiZDZlYWU3NmI1MDRjYmQz OWUwYWU0ODg1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDcmVhdGUg aW5saW5lIGJveGVzIGZvciBoYXJkIGxpbmUgYnJlYWtzKDxicj4pIGFuZCB3b3JkIHdyYXAgb3Bw b3J0dW5pdGllcyAoPHdicj4pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTcwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCb3RoIGhhcmQgPGJyPiBhbmQgdGhlIHdvcmQgYnJlYWsgb3Bwb3J0dW5pdHkg bGF5b3V0IGJveGVzIGdlbmVyYXRlIGlubGluZSBib3hlcyBhbmQgZ2V0IGNvbXB1dGVkIGJveCBn ZW9tZXRyaWVzLgorICAgICAgICBJdCBlbmFibGVzIHVzIHRvIGFuc3dlciBxdWVzdGlvbnMgbGlr ZSBlbGVtZW50Lm9mZnNldFRvcC9vZmZzZXRMZWZ0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5 b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUuaHRtbAorCisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZv cm1hdHRpbmdTdGF0ZTo6Ym94R2VvbWV0cnkpOgorICAgICAgICAqIGxheW91dC9WZXJpZmljYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMYXlvdXRDb250ZXh0Ojp2ZXJpZnlB bmRPdXRwdXRNaXNtYXRjaGluZ0xheW91dFRyZWUpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OmNvbnN0cnVjdElubGluZUJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNM aW5lQnJlYWsgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46Omlz U29mdExpbmVCcmVhayBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1 bjo6aXNIYXJkTGluZUJyZWFrIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxscyk6CisKIDIw MjAtMDktMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIEFkZCBzdXBwb3J0IGZvciA8d2JyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ1N0YXRlLmNwcAppbmRleCBhMmM0ODUzMWU3NmQ2NDhhN2VmOTRhOWVhODhjNGMwZDQ0NTNk NzExLi42N2QyOGI4NzQyOTVlYTVhZmM1YjdmYjQ4YzgyZTQwNTllMzdkZjMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmNwcApAQCAtNTIsOCArNTIsOCBAQCBCb3hH ZW9tZXRyeSYgRm9ybWF0dGluZ1N0YXRlOjpib3hHZW9tZXRyeShjb25zdCBCb3gmIGxheW91dEJv eCkKIHsKICAgICAvLyBTaG91bGQgbmV2ZXIgbmVlZCB0byBtdXRhdGUgYSBkaXNwbGF5IGJveCBv dXRzaWRlIG9mIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuCiAgICAgQVNTRVJUKCZsYXlvdXRTdGF0 ZSgpLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4 dFJvb3QoKSkgPT0gdGhpcyk7Ci0gICAgLy8gQW5vbnltb3VzIHRleHQgd3JhcHBlcnMvbGluZSBi cmVhayBib3hlcyBzaG91bGQgbm90IG5lZWQgZGlzcGxheSBib3hlcy4KLSAgICBBU1NFUlQoIWxh eW91dEJveC5pc0lubGluZVRleHRCb3goKSAmJiAoIWxheW91dEJveC5pc0xpbmVCcmVha0JveCgp IHx8IGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkpOworICAgIC8vIEFub255bW91 cyB0ZXh0IHdyYXBwZXJzIGRvIG5vdCBuZWVkIGRpc3BsYXkgYm94ZXMuCisgICAgQVNTRVJUKCFs YXlvdXRCb3guaXNJbmxpbmVUZXh0Qm94KCkpOwogICAgIHJldHVybiBsYXlvdXRTdGF0ZSgpLmVu c3VyZUdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmNwcAppbmRleCAwMDA0OWY2MmUzNGE4ZTdmOTIwN2NkZmViMWQ5MjQzMWYyMzEw ZmYxLi4xNjk1YmI5YmEyZDlmNThhY2JmZGZmMDYzYTE3Mzc2M2U0YmM1ZDg4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTMsOSArMTEzLDE2IEBAIHZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3Rh dGUmIGludmFsaWRhdGlvCiAgICAgICAgICAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKCps YXlvdXRCb3gsIGNvbnN0cmFpbnRzLmhvcml6b250YWwpOwogICAgICAgICAgICAgICAgIGNvbXB1 dGVIZWlnaHRBbmRNYXJnaW4oKmxheW91dEJveCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCk7CiAg ICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LT5pc0xpbmVCcmVha0Jv eCgpKSB7CisgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgp LmJveEdlb21ldHJ5KCpsYXlvdXRCb3gpOworICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0SG9y aXpvbnRhbE1hcmdpbih7IH0pOworICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0Qm9yZGVyKHsg fSk7CisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRQYWRkaW5nKHsgfSk7CisgICAgICAgICAg ICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoeyB9KTsKKyAgICAgICAgICAgIGJveEdl b21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsgfSk7CiAgICAgICAgIH0gZWxzZSBpZiAobGF5b3V0 Qm94LT5pc0lubGluZUJveCgpKSB7Ci0gICAgICAgICAgICAvLyBUZXh0IHdyYXBwZXIgYm94ZXMg KGFub255bW91cyBpbmxpbmUgbGV2ZWwgYm94ZXMpIGFuZCA8YnI+cyBkb24ndCBoYXZlIGJveCBn ZW9tZXRyaWVzICh0aGV5IG9ubHkgZ2VuZXJhdGUgcnVucykuCi0gICAgICAgICAgICBpZiAoIWxh eW91dEJveC0+aXNJbmxpbmVUZXh0Qm94KCkgJiYgIWxheW91dEJveC0+aXNMaW5lQnJlYWtCb3go KSkgeworICAgICAgICAgICAgLy8gVGV4dCB3cmFwcGVyIGJveGVzIChhbm9ueW1vdXMgaW5saW5l IGxldmVsIGJveGVzKSBkb24ndCBoYXZlIGJveCBnZW9tZXRyaWVzICh0aGV5IG9ubHkgZ2VuZXJh dGUgcnVucykuCisgICAgICAgICAgICBpZiAoIWxheW91dEJveC0+aXNJbmxpbmVUZXh0Qm94KCkp IHsKICAgICAgICAgICAgICAgICAvLyBJbmxpbmUgYm94ZXMgKDxzcGFuPikgY2FuJ3QgZ2V0IHNp emVkL3Bvc2l0aW9uZWQgeWV0LiBBdCB0aGlzIHBvaW50IHdlIGNhbiBvbmx5IGNvbXB1dGUgdGhl aXIgbWFyZ2lucywgYm9yZGVycyBhbmQgcGFkZGluZy4KICAgICAgICAgICAgICAgICBjb21wdXRl Qm9yZGVyQW5kUGFkZGluZygqbGF5b3V0Qm94LCBjb25zdHJhaW50cy5ob3Jpem9udGFsKTsKICAg ICAgICAgICAgICAgICBjb21wdXRlSG9yaXpvbnRhbE1hcmdpbigqbGF5b3V0Qm94LCBjb25zdHJh aW50cy5ob3Jpem9udGFsKTsKQEAgLTIwNiw3ICsyMTMsNyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6 SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZWRJbgogICAgIGF1dG8qIGxheW91dEJveCA9IHJvb3QoKS5maXJzdEluRmxvd09yRmxvYXRpbmdD aGlsZCgpOwogICAgIC8vIEluIG9yZGVyIHRvIGNvbXB1dGUgdGhlIG1heC9taW4gd2lkdGhzLCB3 ZSBuZWVkIHRvIGNvbXB1dGUgbWFyZ2lucywgYm9yZGVycyBhbmQgcGFkZGluZyBmb3IgY2VydGFp biBpbmxpbmUgYm94ZXMgZmlyc3QuCiAgICAgd2hpbGUgKGxheW91dEJveCkgewotICAgICAgICBp ZiAobGF5b3V0Qm94LT5pc0lubGluZVRleHRCb3goKSB8fCBsYXlvdXRCb3gtPmlzTGluZUJyZWFr Qm94KCkpIHsKKyAgICAgICAgaWYgKGxheW91dEJveC0+aXNJbmxpbmVUZXh0Qm94KCkpIHsKICAg ICAgICAgICAgIGxheW91dEJveCA9IG5leHRJbmxpbmVMZXZlbEJveFRvTGF5b3V0KCpsYXlvdXRC b3gsIHJvb3QoKSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtNDI3LDcg KzQzNCw3IEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9t ZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgICAgIGF1dG8gbGluZUluZGV4 ID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVzKCkuc2l6ZSgpOwogICAgICAgICAvLyBDcmVhdGUgdGhl IGlubGluZSBydW5zIG9uIHRoZSBjdXJyZW50IGxpbmUuIFRoaXMgaXMgbW9zdGx5IHRleHQgYW5k IGF0b21pYyBpbmxpbmUgcnVucy4KICAgICAgICAgZm9yIChhdXRvJiBsaW5lUnVuIDogbGluZUNv bnRlbnQucnVucykgewotICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkgfHwgbGluZVJ1 bi5pc0xpbmVCcmVhaygpKQorICAgICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkgfHwgbGlu ZVJ1bi5pc1NvZnRMaW5lQnJlYWsoKSkKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUu YWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5sb2dp Y2FsUmVjdEZvclRleHRSdW4obGluZVJ1biksIGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4u dGV4dENvbnRlbnQoKSB9KTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxpbmVSdW4uaXNCb3goKSkK ICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwg bGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5pbmxpbmVCb3hGb3JMYXlvdXRCb3gobGluZVJ1 bi5sYXlvdXRCb3goKSkubG9naWNhbFJlY3QoKSwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0p OwpAQCAtNDYxLDYgKzQ2OCwxMCBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAg ICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQoYm9yZGVy Qm94TG9naWNhbFRvcExlZnQpKTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNMaW5lQnJlYWtCb3goKSkgeworICAg ICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQo Ym9yZGVyQm94TG9naWNhbFRvcExlZnQpKTsKKyAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5z ZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0VW5pdChpbmxpbmVCb3gtPmxvZ2ljYWxIZWlnaHQo KSkpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgYXV0byBtYXJnaW5Cb3hXaWR0aCA9IGlu bGluZUJveC0+bG9naWNhbFdpZHRoKCk7CiAgICAgICAgICAgICBhdXRvIGNvbnRlbnRCb3hXaWR0 aCA9IG1hcmdpbkJveFdpZHRoIC0gKGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgKyBib3hHZW9t ZXRyeS5ib3JkZXJMZWZ0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nTGVmdCgpLnZhbHVlT3IoMCkp OwogICAgICAgICAgICAgLy8gTm9uLWF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMgbWF5IG9yIG1h eSBub3QgYmUgd3JhcHBlZCBhbmQgaGF2ZSBnZW9tZXRyaWVzIG9uIG11bHRpcGxlIGxpbmVzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA4 M2E2OTQ5Njg5YjNhNzc3Y2Y1YWM1ZDdlMDI4YTI1ZTEwNGQyMWZiLi41NTY3Y2NhNzk3ODA4ODkz MjFhYWZkYWM1NmM2ZGFjNTdhNjJmNzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjI1LDggKzIyNSw4IEBAIHZvaWQgTGluZUJveEJ1 aWxkZXI6OmNvbnN0cnVjdElubGluZUJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6 OlJ1bkxpc3QmCiAKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKICAgICAgICAgYXV0byYg aW5saW5lTGV2ZWxCb3ggPSBydW4ubGF5b3V0Qm94KCk7CisgICAgICAgIGF1dG8gbG9naWNhbExl ZnQgPSBob3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgKyBydW4ubG9naWNhbExlZnQoKTsKICAgICAg ICAgaWYgKHJ1bi5pc0JveCgpKSB7Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9y aXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBh dXRvJiBpbmxpbmVMZXZlbEJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eUZvckJveChpbmxpbmVMZXZlbEJveCk7CiAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxIZWlnaHQg PSBpbmxpbmVMZXZlbEJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpOwogICAgICAgICAgICAg YXV0byBiYXNlbGluZSA9IGxvZ2ljYWxIZWlnaHQ7CkBAIC0yNTMsNyArMjUzLDYgQEAgdm9pZCBM aW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29u c3QgTGluZTo6UnVuTGlzdCYKICAgICAgICAgICAgICAgICBpbmxpbmVCb3gtPnNldElzTm9uRW1w dHkoKTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lQm94KFdURk1vdmUoaW5saW5lQm94 KSk7CiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSkgewotICAgICAg ICAgICAgYXV0byBsb2dpY2FsTGVmdCA9IGhvcml6b250YWxBbGlnbWVudE9mZnNldCArIHJ1bi5s b2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGlu ZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNT RVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElu bGluZUJveChMaW5lQm94OjpJbmxpbmVCb3g6OmNyZWF0ZUJveEZvcklubGluZUJveChpbmxpbmVM ZXZlbEJveCwgbG9naWNhbExlZnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpKTsKQEAgLTI2MSw3ICsy NjAsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhMaW5lQm94 JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5MaXN0JgogICAgICAgICAgICAgLy8gQWRqdXN0IHRo ZSBsb2dpY2FsIHdpZHRoIHdoZW4gdGhlIGlubGluZSBsZXZlbCBjb250YWluZXIgY2xvc2VzIG9u IHRoaXMgbGluZS4KICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9IGxpbmVCb3guaW5saW5l Qm94Rm9yTGF5b3V0Qm94KGlubGluZUxldmVsQm94KTsKICAgICAgICAgICAgIGlubGluZUJveC5z ZXRMb2dpY2FsV2lkdGgocnVuLmxvZ2ljYWxSaWdodCgpIC0gaW5saW5lQm94LmxvZ2ljYWxMZWZ0 KCkpOwotICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNMaW5lQnJlYWso KSkgeworICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNTb2Z0TGluZUJy ZWFrKCkpIHsKICAgICAgICAgICAgIGF1dG8mIHBhcmVudEJveCA9IGlubGluZUxldmVsQm94LnBh cmVudCgpOwogICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gJnBhcmVudEJveCA9 PSAmcm9vdEJveCgpID8gbGluZUJveC5yb290SW5saW5lQm94KCkgOiBsaW5lQm94LmlubGluZUJv eEZvckxheW91dEJveChwYXJlbnRCb3gpOwogICAgICAgICAgICAgaWYgKHBhcmVudElubGluZUJv eC5pc0VtcHR5KCkpIHsKQEAgLTI2OSw3ICsyNjgsMTUgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6 Y29uc3RydWN0SW5saW5lQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlz dCYKICAgICAgICAgICAgICAgICBwYXJlbnRJbmxpbmVCb3guc2V0SXNOb25FbXB0eSgpOwogICAg ICAgICAgICAgICAgIGFkanVzdFZlcnRpY2FsR2VvbWV0cnlGb3JOb25FbXB0eUlubGluZUJveChw YXJlbnRJbmxpbmVCb3gpOwogICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIH0gZWxz ZSBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7CisgICAgICAgICAgICBhdXRvIGlubGluZUJv eCA9IExpbmVCb3g6OklubGluZUJveDo6Y3JlYXRlQm94Rm9ySW5saW5lQm94KGlubGluZUxldmVs Qm94LCBsb2dpY2FsTGVmdCwgeyB9KTsKKyAgICAgICAgICAgIGlubGluZUJveC0+c2V0SXNOb25F bXB0eSgpOworICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5s aW5lQm94KCppbmxpbmVCb3gpOworICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVCb3goV1RG TW92ZShpbmxpbmVCb3gpKTsKKyAgICAgICAgfSBlbHNlIGlmIChydW4uaXNXb3JkQnJlYWtPcHBv cnR1bml0eSgpKQorICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVCb3goTGluZUJveDo6SW5s aW5lQm94OjpjcmVhdGVCb3hGb3JJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGxvZ2ljYWxMZWZ0 LCB7IH0pKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmgKaW5kZXggZjI2ZmFhYzkzYmY0NTUyOWFjZDdkM2ZhZTdmOGIzYTFh NjJlNjhhMC4uNDc2YThjNDgyY2ZkYTg0NjI2OGRhMTM3YzBmNzAyMTQxM2QxMWMxNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aApAQCAtNjUsNyArNjUsOSBAQCBwdWJsaWM6CiAgICAgc3RydWN0IFJ1biB7CiAgICAgICAgIGJv b2wgaXNUZXh0KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OlRl eHQ7IH0KICAgICAgICAgYm9vbCBpc0JveCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxp bmVJdGVtOjpUeXBlOjpCb3g7IH0KLSAgICAgICAgYm9vbCBpc0xpbmVCcmVhaygpIGNvbnN0IHsg cmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpIYXJkTGluZUJyZWFrIHx8IG1fdHlw ZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpTb2Z0TGluZUJyZWFrOyB9CisgICAgICAgIGJvb2wgaXNM aW5lQnJlYWsoKSBjb25zdCB7IHJldHVybiBpc0hhcmRMaW5lQnJlYWsoKSB8fCBpc1NvZnRMaW5l QnJlYWsoKTsgfQorICAgICAgICBib29sIGlzU29mdExpbmVCcmVhaygpIGNvbnN0ICB7IHJldHVy biBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6U29mdExpbmVCcmVhazsgfQorICAgICAgICBi b29sIGlzSGFyZExpbmVCcmVhaygpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVt OjpUeXBlOjpIYXJkTGluZUJyZWFrOyB9CiAgICAgICAgIGJvb2wgaXNXb3JkQnJlYWtPcHBvcnR1 bml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpXb3JkQnJl YWtPcHBvcnR1bml0eTsgfQogICAgICAgICBib29sIGlzQ29udGFpbmVyU3RhcnQoKSBjb25zdCB7 IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6Q29udGFpbmVyU3RhcnQ7IH0KICAg ICAgICAgYm9vbCBpc0NvbnRhaW5lckVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxp bmVJdGVtOjpUeXBlOjpDb250YWluZXJFbmQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQu Y3BwCmluZGV4IDQyNWE1NTMyMjMzMmM4YWI1ODgzMjViMjQ4ZTZiMzExODljMzhmZTYuLmUyMDA5 ZDI1Y2M0YzNjNWUzMmE4YmZiMzJjNmJjM2RkM2YxYjQyMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdDb250ZXh0LmNwcApAQCAtMTI0LDcgKzEyNCw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yQ2VsbHMoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9u CiAgICAgICAgICAgICAgICAgLy8gdGhlIHBhZGRpbmcgYm94IHRvIHZlcnRpY2FsbHkgYWxpZ24g dGhlIHRhYmxlIGNlbGwgY29udGVudC4KICAgICAgICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5n U3RhdGUgPSBsYXlvdXRTdGF0ZSgpLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGNlbGxCb3gp OwogICAgICAgICAgICAgICAgIGZvciAoYXV0byogY2hpbGQgPSBjZWxsQm94LmZpcnN0SW5GbG93 T3JGbG9hdGluZ0NoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0SW5GbG93T3JGbG9h dGluZ1NpYmxpbmcoKSkgewotICAgICAgICAgICAgICAgICAgICBpZiAoY2hpbGQtPmlzQW5vbnlt b3VzKCkgfHwgY2hpbGQtPmlzTGluZUJyZWFrQm94KCkpCisgICAgICAgICAgICAgICAgICAgIGlm IChjaGlsZC0+aXNJbmxpbmVUZXh0Qm94KCkpCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KCpj aGlsZCkubW92ZVZlcnRpY2FsbHkoaW50cmluc2ljUGFkZGluZ1RvcCk7CiAgICAgICAgICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDk2NWIyMzA0YjRjZTkwYzI5YjZlZDgwZjU1YmMxNGEyMGFjOTEzOTIuLjE4 MGFkMTk0NmFkZjE0MjhhYjA1ZmQ2ODEwMjZmMjgzOTVjNzAzODIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAyMC0wOS0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAg ICAgIFtMRkNdW0lGQ10gQ3JlYXRlIGlubGluZSBib3hlcyBmb3IgaGFyZCBsaW5lIGJyZWFrcyg8 YnI+KSBhbmQgd29yZCB3cmFwIG9wcG9ydHVuaXRpZXMgKDx3YnI+KQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDIzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L2JyLWFuZC13YnItc2ltcGxlLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAq IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUuaHRtbDogQWRk ZWQuCisKIDIwMjAtMDktMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIEFkZCBzdXBwb3J0IGZvciA8d2JyPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9ici1hbmQtd2JyLXNpbXBsZS1leHBl Y3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9ici1h bmQtd2JyLXNpbXBsZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhlNDI5YzMyZjI3YjJiNTRm MTdmNTlmNGM3MTRlOWE0M2I1NjBhYzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2JyLWFuZC13YnItc2ltcGxlLWV4cGVjdGVkLmh0 bWwKQEAgLTAsMCArMSw5IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5u ZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5h bDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgor PHN0eWxlPgorZGl2IHsKKyAgd2lkdGg6IDEwcHg7CisgIGhlaWdodDogMzBweDsKKyAgYmFja2dy b3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdj48L2Rpdj4KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h dHRpbmdjb250ZXh0L2JyLWFuZC13YnItc2ltcGxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xh eW91dGZvcm1hdHRpbmdjb250ZXh0L2JyLWFuZC13YnItc2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u M2UxYmY5NGM2MWI1ZTk4M2QwYmYwN2IxODNkZDgwNTljNWMyMWFmNQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1z aW1wbGUuaHRtbApAQCAtMCwwICsxLDExIEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQt dGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1 ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxz ZSBdIC0tPgorPHN0eWxlPgorZGl2IHsKKyAgZm9udC1mYW1pbHk6IEFoZW07CisgIGZvbnQtc2l6 ZTogMTBweDsKKyAgd2lkdGg6IDEwcHg7CisgIGNvbG9yOiBibGFjazsKKyAgYmFja2dyb3VuZC1j b2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdj5maXJzdDxicj5zZWNvbmQ8d2JyPnRoaXJk X2xpbmU8L2Rpdj4K 409811 2020-09-26 21:29:30 -0700 2020-09-27 09:08:58 -0700 Patch bug-217023-20200926212929.patch text/plain 14948 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcxMGZmZDNiMzk3OGIx MGMyZDg2ZDYyZWE3N2ZmOWNiYTc5ODY1NS4uZDhmOGI2MDk0NmIyM2JiZDZlYWU3NmI1MDRjYmQz OWUwYWU0ODg1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA5LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDcmVhdGUg aW5saW5lIGJveGVzIGZvciBoYXJkIGxpbmUgYnJlYWtzKDxicj4pIGFuZCB3b3JkIHdyYXAgb3Bw b3J0dW5pdGllcyAoPHdicj4pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTcwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCb3RoIGhhcmQgPGJyPiBhbmQgdGhlIHdvcmQgYnJlYWsgb3Bwb3J0dW5pdHkg bGF5b3V0IGJveGVzIGdlbmVyYXRlIGlubGluZSBib3hlcyBhbmQgZ2V0IGNvbXB1dGVkIGJveCBn ZW9tZXRyaWVzLgorICAgICAgICBJdCBlbmFibGVzIHVzIHRvIGFuc3dlciBxdWVzdGlvbnMgbGlr ZSBlbGVtZW50Lm9mZnNldFRvcC9vZmZzZXRMZWZ0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5 b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUuaHRtbAorCisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZv cm1hdHRpbmdTdGF0ZTo6Ym94R2VvbWV0cnkpOgorICAgICAgICAqIGxheW91dC9WZXJpZmljYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMYXlvdXRDb250ZXh0Ojp2ZXJpZnlB bmRPdXRwdXRNaXNtYXRjaGluZ0xheW91dFRyZWUpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OmNvbnN0cnVjdElubGluZUJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6aXNM aW5lQnJlYWsgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46Omlz U29mdExpbmVCcmVhayBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1 bjo6aXNIYXJkTGluZUJyZWFrIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxscyk6CisKIDIw MjAtMDktMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIEFkZCBzdXBwb3J0IGZvciA8d2JyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ1N0YXRlLmNwcAppbmRleCBhMmM0ODUzMWU3NmQ2NDhhN2VmOTRhOWVhODhjNGMwZDQ0NTNk NzExLi42N2QyOGI4NzQyOTVlYTVhZmM1YjdmYjQ4YzgyZTQwNTllMzdkZjMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmNwcApAQCAtNTIsOCArNTIsOCBAQCBCb3hH ZW9tZXRyeSYgRm9ybWF0dGluZ1N0YXRlOjpib3hHZW9tZXRyeShjb25zdCBCb3gmIGxheW91dEJv eCkKIHsKICAgICAvLyBTaG91bGQgbmV2ZXIgbmVlZCB0byBtdXRhdGUgYSBkaXNwbGF5IGJveCBv dXRzaWRlIG9mIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuCiAgICAgQVNTRVJUKCZsYXlvdXRTdGF0 ZSgpLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4 dFJvb3QoKSkgPT0gdGhpcyk7Ci0gICAgLy8gQW5vbnltb3VzIHRleHQgd3JhcHBlcnMvbGluZSBi cmVhayBib3hlcyBzaG91bGQgbm90IG5lZWQgZGlzcGxheSBib3hlcy4KLSAgICBBU1NFUlQoIWxh eW91dEJveC5pc0lubGluZVRleHRCb3goKSAmJiAoIWxheW91dEJveC5pc0xpbmVCcmVha0JveCgp IHx8IGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkpOworICAgIC8vIEFub255bW91 cyB0ZXh0IHdyYXBwZXJzIGRvIG5vdCBuZWVkIGRpc3BsYXkgYm94ZXMuCisgICAgQVNTRVJUKCFs YXlvdXRCb3guaXNJbmxpbmVUZXh0Qm94KCkpOwogICAgIHJldHVybiBsYXlvdXRTdGF0ZSgpLmVu c3VyZUdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L1Zl cmlmaWNhdGlvbi5jcHAKaW5kZXggOTNlMDYxZjVmM2I1ZjBkNmI4YTk0ZDNjNzBhNThkOTQyZDIz MWE4MS4uZDZiZDI4OWYxMmIxZThjOTIzOWI4NTQ1YjEwYmIzYjBkZjVlMjYxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAKQEAgLTMzNCwxMyArMzM0LDEzIEBAIHZvaWQg TGF5b3V0Q29udGV4dDo6dmVyaWZ5QW5kT3V0cHV0TWlzbWF0Y2hpbmdMYXlvdXRUcmVlKGNvbnN0 IExheW91dFN0YXRlJiBsYXlvCiB7CiAgICAgVGV4dFN0cmVhbSBzdHJlYW07CiAgICAgYXV0byYg bGF5b3V0Um9vdCA9IGxheW91dFN0YXRlLnJvb3QoKTsKLSAgICBhdXRvIG1pc21hdGNoaW5nR2Vv bWV0cnkgPSB2ZXJpZnlBbmRPdXRwdXRTdWJ0cmVlKHN0cmVhbSwgbGF5b3V0U3RhdGUsIHJvb3RS ZW5kZXJlciwgbGF5b3V0Um9vdCk7Ci0gICAgaWYgKCFtaXNtYXRjaGluZ0dlb21ldHJ5KQotICAg ICAgICByZXR1cm47CiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQogICAgIHNob3dSZW5kZXJU cmVlKCZyb290UmVuZGVyZXIpOwogICAgIHNob3dMYXlvdXRUcmVlKGxheW91dFJvb3QsICZsYXlv dXRTdGF0ZSk7CiAjZW5kaWYKKyAgICBhdXRvIG1pc21hdGNoaW5nR2VvbWV0cnkgPSB2ZXJpZnlB bmRPdXRwdXRTdWJ0cmVlKHN0cmVhbSwgbGF5b3V0U3RhdGUsIHJvb3RSZW5kZXJlciwgbGF5b3V0 Um9vdCk7CisgICAgaWYgKCFtaXNtYXRjaGluZ0dlb21ldHJ5KQorICAgICAgICByZXR1cm47CiAg ICAgV1RGTG9nQWx3YXlzKCIlcyIsIHN0cmVhbS5yZWxlYXNlKCkudXRmOCgpLmRhdGEoKSk7CiAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggMDAwNDlmNjJlMzRhOGU3ZjkyMDdjZGZlYjFkOTI0MzFmMjMxMGZmMS4uNjMz ZDFiNTc0NGQ3NTBkYjQ3YWY5NGFhOGFmM2FjNTMyZmFlZjY3NiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTEzLDkgKzExMywxNiBAQCB2b2lkIElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZh bGlkYXRpbwogICAgICAgICAgICAgICAgIGNvbXB1dGVXaWR0aEFuZE1hcmdpbigqbGF5b3V0Qm94 LCBjb25zdHJhaW50cy5ob3Jpem9udGFsKTsKICAgICAgICAgICAgICAgICBjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKCpsYXlvdXRCb3gsIGNvbnN0cmFpbnRzLmhvcml6b250YWwpOwogICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC0+aXNMaW5lQnJlYWtCb3goKSkgewor ICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9t ZXRyeSgqbGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxN YXJnaW4oeyB9KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldEJvcmRlcih7IH0pOworICAg ICAgICAgICAgYm94R2VvbWV0cnkuc2V0UGFkZGluZyh7IH0pOworICAgICAgICAgICAgYm94R2Vv bWV0cnkuc2V0Q29udGVudEJveFdpZHRoKHsgfSk7CisgICAgICAgICAgICBib3hHZW9tZXRyeS5z ZXRWZXJ0aWNhbE1hcmdpbih7IH0pOwogICAgICAgICB9IGVsc2UgaWYgKGxheW91dEJveC0+aXNJ bmxpbmVCb3goKSkgewotICAgICAgICAgICAgLy8gVGV4dCB3cmFwcGVyIGJveGVzIChhbm9ueW1v dXMgaW5saW5lIGxldmVsIGJveGVzKSBhbmQgPGJyPnMgZG9uJ3QgaGF2ZSBib3ggZ2VvbWV0cmll cyAodGhleSBvbmx5IGdlbmVyYXRlIHJ1bnMpLgotICAgICAgICAgICAgaWYgKCFsYXlvdXRCb3gt PmlzSW5saW5lVGV4dEJveCgpICYmICFsYXlvdXRCb3gtPmlzTGluZUJyZWFrQm94KCkpIHsKKyAg ICAgICAgICAgIC8vIFRleHQgd3JhcHBlciBib3hlcyAoYW5vbnltb3VzIGlubGluZSBsZXZlbCBi b3hlcykgZG9uJ3QgaGF2ZSBib3ggZ2VvbWV0cmllcyAodGhleSBvbmx5IGdlbmVyYXRlIHJ1bnMp LgorICAgICAgICAgICAgaWYgKCFsYXlvdXRCb3gtPmlzSW5saW5lVGV4dEJveCgpKSB7CiAgICAg ICAgICAgICAgICAgLy8gSW5saW5lIGJveGVzICg8c3Bhbj4pIGNhbid0IGdldCBzaXplZC9wb3Np dGlvbmVkIHlldC4gQXQgdGhpcyBwb2ludCB3ZSBjYW4gb25seSBjb21wdXRlIHRoZWlyIG1hcmdp bnMsIGJvcmRlcnMgYW5kIHBhZGRpbmcuCiAgICAgICAgICAgICAgICAgY29tcHV0ZUJvcmRlckFu ZFBhZGRpbmcoKmxheW91dEJveCwgY29uc3RyYWludHMuaG9yaXpvbnRhbCk7CiAgICAgICAgICAg ICAgICAgY29tcHV0ZUhvcml6b250YWxNYXJnaW4oKmxheW91dEJveCwgY29uc3RyYWludHMuaG9y aXpvbnRhbCk7CkBAIC0yMDYsNyArMjEzLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkSW4KICAg ICBhdXRvKiBsYXlvdXRCb3ggPSByb290KCkuZmlyc3RJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKTsK ICAgICAvLyBJbiBvcmRlciB0byBjb21wdXRlIHRoZSBtYXgvbWluIHdpZHRocywgd2UgbmVlZCB0 byBjb21wdXRlIG1hcmdpbnMsIGJvcmRlcnMgYW5kIHBhZGRpbmcgZm9yIGNlcnRhaW4gaW5saW5l IGJveGVzIGZpcnN0LgogICAgIHdoaWxlIChsYXlvdXRCb3gpIHsKLSAgICAgICAgaWYgKGxheW91 dEJveC0+aXNJbmxpbmVUZXh0Qm94KCkgfHwgbGF5b3V0Qm94LT5pc0xpbmVCcmVha0JveCgpKSB7 CisgICAgICAgIGlmIChsYXlvdXRCb3gtPmlzSW5saW5lVGV4dEJveCgpKSB7CiAgICAgICAgICAg ICBsYXlvdXRCb3ggPSBuZXh0SW5saW5lTGV2ZWxCb3hUb0xheW91dCgqbGF5b3V0Qm94LCByb290 KCkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KQEAgLTQyNyw2ICs0MzQsNyBA QCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JM aW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICBhdXRvIGxpbmVJbmRleCA9IGZvcm1h dHRpbmdTdGF0ZS5saW5lcygpLnNpemUoKTsKICAgICAgICAgLy8gQ3JlYXRlIHRoZSBpbmxpbmUg cnVucyBvbiB0aGUgY3VycmVudCBsaW5lLiBUaGlzIGlzIG1vc3RseSB0ZXh0IGFuZCBhdG9taWMg aW5saW5lIHJ1bnMuCiAgICAgICAgIGZvciAoYXV0byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1 bnMpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90IG5lZWQgdG8gY29uc3Ry dWN0IGEgbGluZSBydW4gZm9yIDxicj4uCiAgICAgICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQo KSB8fCBsaW5lUnVuLmlzTGluZUJyZWFrKCkpCiAgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0 YXRlLmFkZExpbmVSdW4oeyBsaW5lSW5kZXgsIGxpbmVSdW4ubGF5b3V0Qm94KCksIGxpbmVCb3gu bG9naWNhbFJlY3RGb3JUZXh0UnVuKGxpbmVSdW4pLCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5l UnVuLnRleHRDb250ZW50KCkgfSk7CiAgICAgICAgICAgICBlbHNlIGlmIChsaW5lUnVuLmlzQm94 KCkpCkBAIC00NjEsNiArNDY5LDEwIEBAIElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAgICAgICAg ICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2ludChib3Jk ZXJCb3hMb2dpY2FsVG9wTGVmdCkpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgfQorICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKSB7Cisg ICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2lu dChib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCkpOworICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5 LnNldENvbnRlbnRCb3hIZWlnaHQodG9MYXlvdXRVbml0KGlubGluZUJveC0+bG9naWNhbEhlaWdo dCgpKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBhdXRvIG1hcmdpbkJveFdpZHRoID0g aW5saW5lQm94LT5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIGF1dG8gY29udGVudEJveFdp ZHRoID0gbWFyZ2luQm94V2lkdGggLSAoYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSArIGJveEdl b21ldHJ5LmJvcmRlckxlZnQoKSArIGJveEdlb21ldHJ5LnBhZGRpbmdMZWZ0KCkudmFsdWVPcigw KSk7CiAgICAgICAgICAgICAvLyBOb24tYXRvbWljIGlubGluZSBsZXZlbCBib3hlcyBtYXkgb3Ig bWF5IG5vdCBiZSB3cmFwcGVkIGFuZCBoYXZlIGdlb21ldHJpZXMgb24gbXVsdGlwbGUgbGluZXMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4 IDgzYTY5NDk2ODliM2E3NzdjZjVhYzVkN2UwMjhhMjVlMTA0ZDIxZmIuLjU1NjdjY2E3OTc4MDg4 OTMyMWFhZmRhYzU2YzZkYWM1N2E2MmY3ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yMjUsOCArMjI1LDggQEAgdm9pZCBMaW5lQm94 QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZTo6UnVuTGlzdCYKIAogICAgIGZvciAoYXV0byYgcnVuIDogcnVucykgewogICAgICAgICBhdXRv JiBpbmxpbmVMZXZlbEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKKyAgICAgICAgYXV0byBsb2dpY2Fs TGVmdCA9IGhvcml6b250YWxBbGlnbWVudE9mZnNldCArIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAg ICAgICBpZiAocnVuLmlzQm94KCkpIHsKLSAgICAgICAgICAgIGF1dG8gbG9naWNhbExlZnQgPSBo b3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgKyBydW4ubG9naWNhbExlZnQoKTsKICAgICAgICAgICAg IGF1dG8mIGlubGluZUxldmVsQm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21l dHJ5Rm9yQm94KGlubGluZUxldmVsQm94KTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbEhlaWdo dCA9IGlubGluZUxldmVsQm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCk7CiAgICAgICAgICAg ICBhdXRvIGJhc2VsaW5lID0gbG9naWNhbEhlaWdodDsKQEAgLTI1Myw3ICsyNTMsNiBAQCB2b2lk IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBj b25zdCBMaW5lOjpSdW5MaXN0JgogICAgICAgICAgICAgICAgIGlubGluZUJveC0+c2V0SXNOb25F bXB0eSgpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVCb3goV1RGTW92ZShpbmxpbmVC b3gpKTsKICAgICAgICAgfSBlbHNlIGlmIChydW4uaXNDb250YWluZXJTdGFydCgpKSB7Ci0gICAg ICAgICAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRhbEFsaWdtZW50T2Zmc2V0ICsgcnVu LmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBhdXRvIGluaXRpYWxMb2dpY2FsV2lkdGggPSBs aW5lQm94LmxvZ2ljYWxXaWR0aCgpIC0gcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBB U1NFUlQoaW5pdGlhbExvZ2ljYWxXaWR0aCA+PSAwKTsKICAgICAgICAgICAgIGxpbmVCb3guYWRk SW5saW5lQm94KExpbmVCb3g6OklubGluZUJveDo6Y3JlYXRlQm94Rm9ySW5saW5lQm94KGlubGlu ZUxldmVsQm94LCBsb2dpY2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxXaWR0aCkpOwpAQCAtMjYxLDcg KzI2MCw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUJveGVzKExpbmVC b3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmCiAgICAgICAgICAgICAvLyBBZGp1c3Qg dGhlIGxvZ2ljYWwgd2lkdGggd2hlbiB0aGUgaW5saW5lIGxldmVsIGNvbnRhaW5lciBjbG9zZXMg b24gdGhpcyBsaW5lLgogICAgICAgICAgICAgYXV0byYgaW5saW5lQm94ID0gbGluZUJveC5pbmxp bmVCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gpOwogICAgICAgICAgICAgaW5saW5lQm94 LnNldExvZ2ljYWxXaWR0aChydW4ubG9naWNhbFJpZ2h0KCkgLSBpbmxpbmVCb3gubG9naWNhbExl ZnQoKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc0xpbmVCcmVh aygpKSB7CisgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc1NvZnRMaW5l QnJlYWsoKSkgewogICAgICAgICAgICAgYXV0byYgcGFyZW50Qm94ID0gaW5saW5lTGV2ZWxCb3gu cGFyZW50KCk7CiAgICAgICAgICAgICBhdXRvJiBwYXJlbnRJbmxpbmVCb3ggPSAmcGFyZW50Qm94 ID09ICZyb290Qm94KCkgPyBsaW5lQm94LnJvb3RJbmxpbmVCb3goKSA6IGxpbmVCb3guaW5saW5l Qm94Rm9yTGF5b3V0Qm94KHBhcmVudEJveCk7CiAgICAgICAgICAgICBpZiAocGFyZW50SW5saW5l Qm94LmlzRW1wdHkoKSkgewpAQCAtMjY5LDcgKzI2OCwxNSBAQCB2b2lkIExpbmVCb3hCdWlsZGVy Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5M aXN0JgogICAgICAgICAgICAgICAgIHBhcmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7CiAg ICAgICAgICAgICAgICAgYWRqdXN0VmVydGljYWxHZW9tZXRyeUZvck5vbkVtcHR5SW5saW5lQm94 KHBhcmVudElubGluZUJveCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgfSBl bHNlIGlmIChydW4uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGF1dG8gaW5saW5l Qm94ID0gTGluZUJveDo6SW5saW5lQm94OjpjcmVhdGVCb3hGb3JJbmxpbmVCb3goaW5saW5lTGV2 ZWxCb3gsIGxvZ2ljYWxMZWZ0LCB7IH0pOworICAgICAgICAgICAgaW5saW5lQm94LT5zZXRJc05v bkVtcHR5KCk7CisgICAgICAgICAgICBhZGp1c3RWZXJ0aWNhbEdlb21ldHJ5Rm9yTm9uRW1wdHlJ bmxpbmVCb3goKmlubGluZUJveCk7CisgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUJveChX VEZNb3ZlKGlubGluZUJveCkpOworICAgICAgICB9IGVsc2UgaWYgKHJ1bi5pc1dvcmRCcmVha09w cG9ydHVuaXR5KCkpCisgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUJveChMaW5lQm94OjpJ bmxpbmVCb3g6OmNyZWF0ZUJveEZvcklubGluZUJveChpbmxpbmVMZXZlbEJveCwgbG9naWNhbExl ZnQsIHsgfSkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaAppbmRleCBmMjZmYWFjOTNiZjQ1NTI5YWNkN2QzZmFlN2Y4YjNh MWE2MmU2OGEwLi40NzZhOGM0ODJjZmRhODQ2MjY4ZGExMzdjMGY3MDIxNDEzZDExYzE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oCkBAIC02NSw3ICs2NSw5IEBAIHB1YmxpYzoKICAgICBzdHJ1Y3QgUnVuIHsKICAgICAgICAg Ym9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gSW5saW5lSXRlbTo6VHlwZTo6 VGV4dDsgfQogICAgICAgICBib29sIGlzQm94KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElu bGluZUl0ZW06OlR5cGU6OkJveDsgfQotICAgICAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3Qg eyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWsgfHwgbV90 eXBlID09IElubGluZUl0ZW06OlR5cGU6OlNvZnRMaW5lQnJlYWs7IH0KKyAgICAgICAgYm9vbCBp c0xpbmVCcmVhaygpIGNvbnN0IHsgcmV0dXJuIGlzSGFyZExpbmVCcmVhaygpIHx8IGlzU29mdExp bmVCcmVhaygpOyB9CisgICAgICAgIGJvb2wgaXNTb2Z0TGluZUJyZWFrKCkgY29uc3QgIHsgcmV0 dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpTb2Z0TGluZUJyZWFrOyB9CisgICAgICAg IGJvb2wgaXNIYXJkTGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0 ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWs7IH0KICAgICAgICAgYm9vbCBpc1dvcmRCcmVha09wcG9y dHVuaXR5KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OldvcmRC cmVha09wcG9ydHVuaXR5OyB9CiAgICAgICAgIGJvb2wgaXNDb250YWluZXJTdGFydCgpIGNvbnN0 IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpDb250YWluZXJTdGFydDsgfQog ICAgICAgICBib29sIGlzQ29udGFpbmVyRW5kKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IElu bGluZUl0ZW06OlR5cGU6OkNvbnRhaW5lckVuZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggNDI1YTU1MzIyMzMyYzhhYjU4ODMyNWIyNDhlNmIzMTE4OWMzOGZlNi4uZTIw MDlkMjVjYzRjM2M1ZTMyYThiZmIzMmM2YmMzZGQzZjFiNDIwOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0 dGluZ0NvbnRleHQuY3BwCkBAIC0xMjQsNyArMTI0LDcgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdD b250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JDZWxscyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6 b24KICAgICAgICAgICAgICAgICAvLyB0aGUgcGFkZGluZyBib3ggdG8gdmVydGljYWxseSBhbGln biB0aGUgdGFibGUgY2VsbCBjb250ZW50LgogICAgICAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRp bmdTdGF0ZSA9IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUoY2VsbEJv eCk7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGNlbGxCb3guZmlyc3RJbkZs b3dPckZsb2F0aW5nQ2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRJbkZsb3dPckZs b2F0aW5nU2libGluZygpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNBbm9u eW1vdXMoKSB8fCBjaGlsZC0+aXNMaW5lQnJlYWtCb3goKSkKKyAgICAgICAgICAgICAgICAgICAg aWYgKGNoaWxkLT5pc0lubGluZVRleHRCb3goKSkKICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnko KmNoaWxkKS5tb3ZlVmVydGljYWxseShpbnRyaW5zaWNQYWRkaW5nVG9wKTsKICAgICAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggOTY1YjIzMDRiNGNlOTBjMjliNmVkODBmNTViYzE0YTIwYWM5MTM5Mi4u MTgwYWQxOTQ2YWRmMTQyOGFiMDVmZDY4MTAyNmYyODM5NWM3MDM4MiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIwLTA5LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAg ICAgICAgW0xGQ11bSUZDXSBDcmVhdGUgaW5saW5lIGJveGVzIGZvciBoYXJkIGxpbmUgYnJlYWtz KDxicj4pIGFuZCB3b3JkIHdyYXAgb3Bwb3J0dW5pdGllcyAoPHdicj4pCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcwMjMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9ici1hbmQtd2JyLXNpbXBsZS5odG1sOiBB ZGRlZC4KKwogMjAyMC0wOS0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIDx3YnI+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2JyLWFuZC13YnItc2ltcGxlLWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2Jy LWFuZC13YnItc2ltcGxlLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGU0MjljMzJmMjdiMmI1 NGYxN2Y1OWY0YzcxNGU5YTQzYjU2MGFjMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUtZXhwZWN0ZWQu aHRtbApAQCAtMCwwICsxLDkgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1 bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGludGVy bmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0gLS0+ Cis8c3R5bGU+CitkaXYgeworICB3aWR0aDogMTBweDsKKyAgaGVpZ2h0OiAzMHB4OworICBiYWNr Z3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8ZGl2PjwvZGl2PgpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9y bWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv bGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvYnItYW5kLXdici1zaW1wbGUuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4zZTFiZjk0YzYxYjVlOTgzZDBiZjA3YjE4M2RkODA1OWM1YzIxYWY1Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9ici1hbmQtd2Jy LXNpbXBsZS5odG1sCkBAIC0wLDAgKzEsMTEgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtp dC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10 cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZh bHNlIF0gLS0+Cis8c3R5bGU+CitkaXYgeworICBmb250LWZhbWlseTogQWhlbTsKKyAgZm9udC1z aXplOiAxMHB4OworICB3aWR0aDogMTBweDsKKyAgY29sb3I6IGJsYWNrOworICBiYWNrZ3JvdW5k LWNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8ZGl2PmZpcnN0PGJyPnNlY29uZDx3YnI+dGhp cmRfbGluZTwvZGl2Pgo= 409837 2020-09-27 09:07:58 -0700 2020-09-27 09:31:00 -0700 Patch bug-217023-20200927090758.patch text/plain 1621 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JhOWExODNkZmQ1OWQ3 MTY5NzgxNTg0ZGJmZDUwYmE2NGZhODQ3ZS4uMzU0ZTAyMzlhMmMwNDM2ODU0OTBhMDcwMDg3OWU4 ZjdhYTQzNzEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEwIEBACisyMDIwLTA5LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5yZXZpZXdlZC4gQ2FsbCBz aG93TGF5b3V0VHJlZSBvbmx5IHdoZW4gdHJlZXMgYXJlIG1pc21hdGNoaW5nLgorCisgICAgICAg ICogbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxh eW91dENvbnRleHQ6OnZlcmlmeUFuZE91dHB1dE1pc21hdGNoaW5nTGF5b3V0VHJlZSk6CisKIDIw MjAtMDktMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIENyZWF0ZSBpbmxpbmUgYm94ZXMgZm9yIGhhcmQgbGluZSBicmVha3MoPGJyPikgYW5k IHdvcmQgd3JhcCBvcHBvcnR1bml0aWVzICg8d2JyPikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L1Zlcmlm aWNhdGlvbi5jcHAKaW5kZXggZDZiZDI4OWYxMmIxZThjOTIzOWI4NTQ1YjEwYmIzYjBkZjVlMjYx NC4uOTNlMDYxZjVmM2I1ZjBkNmI4YTk0ZDNjNzBhNThkOTQyZDIzMWE4MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAKQEAgLTMzNCwxMyArMzM0LDEzIEBAIHZvaWQgTGF5 b3V0Q29udGV4dDo6dmVyaWZ5QW5kT3V0cHV0TWlzbWF0Y2hpbmdMYXlvdXRUcmVlKGNvbnN0IExh eW91dFN0YXRlJiBsYXlvCiB7CiAgICAgVGV4dFN0cmVhbSBzdHJlYW07CiAgICAgYXV0byYgbGF5 b3V0Um9vdCA9IGxheW91dFN0YXRlLnJvb3QoKTsKKyAgICBhdXRvIG1pc21hdGNoaW5nR2VvbWV0 cnkgPSB2ZXJpZnlBbmRPdXRwdXRTdWJ0cmVlKHN0cmVhbSwgbGF5b3V0U3RhdGUsIHJvb3RSZW5k ZXJlciwgbGF5b3V0Um9vdCk7CisgICAgaWYgKCFtaXNtYXRjaGluZ0dlb21ldHJ5KQorICAgICAg ICByZXR1cm47CiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQogICAgIHNob3dSZW5kZXJUcmVl KCZyb290UmVuZGVyZXIpOwogICAgIHNob3dMYXlvdXRUcmVlKGxheW91dFJvb3QsICZsYXlvdXRT dGF0ZSk7CiAjZW5kaWYKLSAgICBhdXRvIG1pc21hdGNoaW5nR2VvbWV0cnkgPSB2ZXJpZnlBbmRP dXRwdXRTdWJ0cmVlKHN0cmVhbSwgbGF5b3V0U3RhdGUsIHJvb3RSZW5kZXJlciwgbGF5b3V0Um9v dCk7Ci0gICAgaWYgKCFtaXNtYXRjaGluZ0dlb21ldHJ5KQotICAgICAgICByZXR1cm47CiAgICAg V1RGTG9nQWx3YXlzKCIlcyIsIHN0cmVhbS5yZWxlYXNlKCkudXRmOCgpLmRhdGEoKSk7CiAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9Cg==