233744 2021-12-01 19:46:44 -0800 [LFC][IFC] Move the (bidi)display boxes horizontally by the inline box margin, border and padding end as needed 2021-12-03 15:43:25 -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 1819538 0 zalan 2021-12-01 19:46:44 -0800 ssia 1819539 1 445658 zalan 2021-12-01 20:02:39 -0800 Created attachment 445658 Patch 1819540 2 445659 zalan 2021-12-01 20:03:42 -0800 Created attachment 445659 Patch 1819542 3 445660 zalan 2021-12-01 20:09:29 -0800 Created attachment 445660 Patch 1819545 4 445663 zalan 2021-12-01 20:14:06 -0800 Created attachment 445663 Patch 1820332 5 ews-feeder 2021-12-03 15:42:52 -0800 Committed r286518 (244853@main): <https://commits.webkit.org/244853@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445663. 1820333 6 webkit-bug-importer 2021-12-03 15:43:25 -0800 <rdar://problem/86037455> 445658 2021-12-01 20:02:39 -0800 2021-12-01 20:03:40 -0800 Patch bug-233744-20211201200238.patch text/plain 7251 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E0NzY3OTZkZTllZGZk M2Y4MjQ2MzI2ZjQ4N2M1YTEzMWJmNDliYS4uZTUxYmU4ZWY2NjA2NmY3MWJmYzFkMTcxY2U3YzZi NDUzOWVjNjkyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzc0NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAgdHJhY2sgb2YgdGhlIGlubGluZSBib3gg cmFuZ2UgaW4gdGhlIGNvbnRleHQgb2YgZGlzcGxheSBib3hlcyBzbyB0aGF0IHdlIGNhbiBhZGp1 c3QgdGhlIGNvbnRlbnQgaG9yaXpvbnRhbGx5CisgICAgICAgIHdpdGggdGhlIG1hcmdpbi9ib3Jk ZXIvcGFkZGluZyBlbmQgb2YgdGhlICJsYXN0IiBpbmxpbmUgYm94LgorICAgICAgICBXZSBhbHNv IHNldCB0aGUgd2lkdGggb2YgdGhlIChmcmFnbWVudGVkIGlubGluZSBib3ggdHlwZSBvZikgZGlz cGxheSBib3hlcyBoZXJlIGJhc2VkIG9uIHRoZWlyIGNvbnRlbnQgcmlnaHQgcG9zaXRpb24uIAor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJveC5oOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lRGlzcGxheTo6Qm94OjpzZXRMb2dpY2FsUmlnaHQpOgor ICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJBbmRQYWRkaW5nRW5kIGNvbnN0 KToKKwogMjAyMS0xMi0wMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bSUZDXSBTZXQgdGhlIGZpcnN0L2xhc3QgYm94IGZsYWcgb24gdGhlIChiaWRpIGZy YWdtZW50ZWQpIGlubGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCBhYjhh M2MzNDJhYzFjODQxNWM1MTI4NzNlZTNmYzg3NzQ0M2FlMjY5Li42YWY5MjA5YzJlYjQxNjQzZGVi MDIyMGUyYWI3ZTBkZGNiZmRlYjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTM0LDYgKzM0LDkgQEAKICNpbmNsdWRl ICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiVGV4dFV0aWwuaCIKICNpbmNs dWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYvUmFuZ2UuaD4KKwordXNpbmcg V1RGOjpSYW5nZTsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CkBA IC0zNTcsNiArMzYwLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nl c3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKIHsKICAgICBBU1NFUlQo bGluZUNvbnRlbnQudmlzdWFsT3JkZXJMaXN0LnNpemUoKSA9PSBsaW5lQ29udGVudC5ydW5zLnNp emUoKSk7CiAKKyAgICBWZWN0b3I8UmFuZ2U8c2l6ZV90Pj4gaW5saW5lQm94UmFuZ2VMaXN0Owog ICAgIGF1dG8gbmVlZHNOb25Sb290SW5saW5lQm94RGlzcGxheUJveCA9IGZhbHNlOwogICAgIGF1 dG8gY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1YWxPcmRlckZvckNvbnRlbnRSdW5zID0gWyZdIHsK ICAgICAgICAgYXV0byByb290SW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JS b290SW5saW5lQm94KCk7CkBAIC00NTcsNiArNDYxLDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKIAogICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZl cnNlZFJhbmdlKGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2UpKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmNvbnRhaW5zKGlubGluZUJv eCkpOworICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0LmFwcGVuZCh7 IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KGlubGluZUJveCksIGluZGV4IH0pOwogICAgICAg ICAgICAgICAgICAgICAgICAgcGFyZW50Qm94U3RhY2sucmVtb3ZlKGlubGluZUJveCk7CiAgICAg ICAgICAgICAgICAgICAgIH0KIApAQCAtNDk4LDExICs1MDQsMTggQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6 TGluZUNvbnQKICAgICAgICAgICAgICAgICBpbmxpbmVCb3hOZWVkaW5nRGlzcGxheUJveExpc3Qu YXBwZW5kKGFuY2VzdG9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICAvLyAi Q2xvc2UiIHRoZSByZW1haW5pbmcgaW5saW5lIGJveGVzIG9uIHRoZSBzdGFjayAoZXhjbHVkaW5n IHRoZSByb290KS4KKyAgICAgICAgd2hpbGUgKHBhcmVudEJveFN0YWNrLnNpemUoKSA+IDEpIHsK KyAgICAgICAgICAgIGF1dG8qIHBhcmVudElubGluZUJveCA9IHBhcmVudEJveFN0YWNrLnRha2VM YXN0KCk7CisgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94RGlzcGxheUJveE1hcC5jb250YWlu cyhwYXJlbnRJbmxpbmVCb3gpKTsKKyAgICAgICAgICAgIGlubGluZUJveFJhbmdlTGlzdC5hcHBl bmQoeyBpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmdldChwYXJlbnRJbmxpbmVCb3gpLCBib3hlcy5z aXplKCkgfSk7CisgICAgICAgIH0KICAgICB9OwogICAgIGlmIChuZWVkc05vblJvb3RJbmxpbmVC b3hEaXNwbGF5Qm94KQogICAgICAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9y SW5saW5lQm94ZXMoKTsKIAogICAgIGF1dG8gYWRqdXN0VmlzdWFsR2VvbWV0cnlXaXRoSW5saW5l Qm94ZXMgPSBbJl0geworICAgICAgICBzaXplX3QgY3VycmVudElubGluZUJveCA9IDA7CiAgICAg ICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKIAogICAg ICAgICBBU1NFUlQoYm94ZXNbMF0uaXNSb290SW5saW5lQm94KCkpOwpAQCAtNTEwLDYgKzUyMywy MSBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50 KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgYXV0byYgZGlzcGxheUJv eCA9IGJveGVzW2luZGV4XTsKICAgICAgICAgICAgIGRpc3BsYXlCb3gubW92ZUhvcml6b250YWxs eShhY2N1bXVsYXRlZE9mZnNldCk7CiAKKyAgICAgICAgICAgIHdoaWxlIChjdXJyZW50SW5saW5l Qm94IDwgaW5saW5lQm94UmFuZ2VMaXN0LnNpemUoKSAmJiBpbmRleCA9PSBpbmxpbmVCb3hSYW5n ZUxpc3RbY3VycmVudElubGluZUJveF0uZW5kKCkgLSAxKSB7CisgICAgICAgICAgICAgICAgLy8g V2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGlubGluZSBib3ggY29udGVudC4KKyAgICAgICAgICAg ICAgICAvLyBMZXQncyBjb21wdXRlIHRoZSBpbmxpbmUgYm94IHdpZHRoIGFuZCBvZmZzZXQgdGhl IHJlc3Qgb2YgdGhlIGNvbnRlbnQgd2l0aCBwYWRkaW5nL2JvcmRlci9tYXJnaW4gZW5kLgorICAg ICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94UmFuZ2UgPSBpbmxpbmVCb3hSYW5nZUxpc3RbY3Vy cmVudElubGluZUJveCsrXTsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3hEaXNwbGF5 Qm94ID0gYm94ZXNbaW5saW5lQm94UmFuZ2UuYmVnaW4oKV07CisgICAgICAgICAgICAgICAgQVNT RVJUKGlubGluZUJveERpc3BsYXlCb3guaXNOb25Sb290SW5saW5lQm94KCkpOworCisgICAgICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRy eShpbmxpbmVCb3hEaXNwbGF5Qm94LmxheW91dEJveCgpKTsKKyAgICAgICAgICAgICAgICBhdXRv IGNvbnRlbnRSaWdodCA9IGRpc3BsYXlCb3gubG9naWNhbFJpZ2h0KCk7CisgICAgICAgICAgICAg ICAgaWYgKGlubGluZUJveERpc3BsYXlCb3guaXNMYXN0Qm94KCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgYWNjdW11bGF0ZWRPZmZzZXQgKz0gYm94R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ0Vu ZCgpICsgYm94R2VvbWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAgICAgIGlubGlu ZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJpZ2h0KGNvbnRlbnRSaWdodCArIGJveEdlb21ldHJ5 LmJvcmRlckFuZFBhZGRpbmdFbmQoKSk7CisgICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJpZ2h0KGNvbnRlbnRS aWdodCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoZGlzcGxheUJveC5pc05vblJv b3RJbmxpbmVCb3goKSAmJiBkaXNwbGF5Qm94LmlzRmlyc3RCb3goKSkgewogICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgdGhlICdlbmQnIHNpZGUgb2YgdGhlIGlubGlu ZSBib3guCiAgICAgICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gZGlzcGxheUJveC5sYXlv dXRCb3goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJveC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94 LmgKaW5kZXggMzk4NzA4Y2Y1OTg3NDlmZTIwNmVlYzM2MzdhZDdjYzdlZjAxMzJmZi4uNGU1YTkx NDlmZjZiNzJiOTYxZTMzYTRhM2UzMWI5ZDNiNjI1Yzk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKQEAgLTEwOSw2ICsxMDksNyBAQCBzdHJ1 Y3QgQm94IHsKICAgICB2b2lkIG1vdmVIb3Jpem9udGFsbHkoTGF5b3V0OjpJbmxpbmVMYXlvdXRV bml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVIb3Jpem9udGFsbHkob2Zmc2V0KTsgfQog ICAgIHZvaWQgYWRqdXN0SW5rT3ZlcmZsb3coY29uc3QgTGF5b3V0OjpJbmxpbmVSZWN0JiBjaGls ZEJvcmRlckJveCkgeyByZXR1cm4gbV9pbmtPdmVyZmxvdy5leHBhbmRUb0NvbnRhaW4oY2hpbGRC b3JkZXJCb3gpOyB9CiAgICAgdm9pZCB0cnVuY2F0ZShMYXlvdXQ6OklubGluZUxheW91dFVuaXQg dHJ1bmNhdGVkd2lkdGggPSAwLmYpOworICAgIHZvaWQgc2V0TG9naWNhbFJpZ2h0KExheW91dDo6 SW5saW5lTGF5b3V0VW5pdCByaWdodCkgeyBtX2xvZ2ljYWxSZWN0LnNldFJpZ2h0KHJpZ2h0KTsg fQogCiAgICAgc3RkOjpvcHRpb25hbDxUZXh0PiYgdGV4dCgpIHsgcmV0dXJuIG1fdGV4dDsgfQog ICAgIGNvbnN0IHN0ZDo6b3B0aW9uYWw8VGV4dD4mIHRleHQoKSBjb25zdCB7IHJldHVybiBtX3Rl eHQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveEdlb21ldHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRC b3hHZW9tZXRyeS5oCmluZGV4IDhjZTdkZGU3MDMzMWIzZGY3ODFjODhlMjVlMDUzMGExYjBkMjIy MjEuLjg1ZmFmOGM4ZTY3ODMwMTg5OWJhZjU4OTAyNDUxMzFlYzNlY2YwN2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaApA QCAtNzgsNyArNzgsOCBAQCBwdWJsaWM6CiAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBo b3Jpem9udGFsUGFkZGluZygpIGNvbnN0OwogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBib3JkZXJB bmRQYWRkaW5nU3RhcnQoKSBjb25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVm dCgpLnZhbHVlX29yKDApOyB9Ci0gICAgCisgICAgSW5saW5lTGF5b3V0VW5pdCBib3JkZXJBbmRQ YWRkaW5nRW5kKCkgY29uc3QgeyByZXR1cm4gYm9yZGVyUmlnaHQoKSArIHBhZGRpbmdSaWdodCgp LnZhbHVlX29yKDApOyB9CisKICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hUb3AoKSBjb25zdCB7 IHJldHVybiBwYWRkaW5nQm94VG9wKCkgKyBwYWRkaW5nVG9wKCkudmFsdWVfb3IoMCk7IH0KICAg ICBMYXlvdXRVbml0IGNvbnRlbnRCb3hMZWZ0KCkgY29uc3QgeyByZXR1cm4gcGFkZGluZ0JveExl ZnQoKSArIHBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7IH0KICAgICBMYXlvdXRVbml0IGNvbnRl bnRCb3hCb3R0b20oKSBjb25zdCB7IHJldHVybiBjb250ZW50Qm94VG9wKCkgKyBjb250ZW50Qm94 SGVpZ2h0KCk7IH0K 445659 2021-12-01 20:03:42 -0800 2021-12-01 20:09:27 -0800 Patch bug-233744-20211201200341.patch text/plain 7332 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E0NzY3OTZkZTllZGZk M2Y4MjQ2MzI2ZjQ4N2M1YTEzMWJmNDliYS4uZTUxYmU4ZWY2NjA2NmY3MWJmYzFkMTcxY2U3YzZi NDUzOWVjNjkyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzc0NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAgdHJhY2sgb2YgdGhlIGlubGluZSBib3gg cmFuZ2UgaW4gdGhlIGNvbnRleHQgb2YgZGlzcGxheSBib3hlcyBzbyB0aGF0IHdlIGNhbiBhZGp1 c3QgdGhlIGNvbnRlbnQgaG9yaXpvbnRhbGx5CisgICAgICAgIHdpdGggdGhlIG1hcmdpbi9ib3Jk ZXIvcGFkZGluZyBlbmQgb2YgdGhlICJsYXN0IiBpbmxpbmUgYm94LgorICAgICAgICBXZSBhbHNv IHNldCB0aGUgd2lkdGggb2YgdGhlIChmcmFnbWVudGVkIGlubGluZSBib3ggdHlwZSBvZikgZGlz cGxheSBib3hlcyBoZXJlIGJhc2VkIG9uIHRoZWlyIGNvbnRlbnQgcmlnaHQgcG9zaXRpb24uIAor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJveC5oOgor ICAgICAgICAoV2ViQ29yZTo6SW5saW5lRGlzcGxheTo6Qm94OjpzZXRMb2dpY2FsUmlnaHQpOgor ICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJveEdlb21ldHJ5Ojpib3JkZXJBbmRQYWRkaW5nRW5kIGNvbnN0 KToKKwogMjAyMS0xMi0wMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bSUZDXSBTZXQgdGhlIGZpcnN0L2xhc3QgYm94IGZsYWcgb24gdGhlIChiaWRpIGZy YWdtZW50ZWQpIGlubGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCBhYjhh M2MzNDJhYzFjODQxNWM1MTI4NzNlZTNmYzg3NzQ0M2FlMjY5Li5iZDIwMjUwZTU0OTZjNjEwZDBk MjBlZDc2Yzg1MTg0MTA3NmRkYTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTM0LDYgKzM0LDkgQEAKICNpbmNsdWRl ICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiVGV4dFV0aWwuaCIKICNpbmNs dWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYvUmFuZ2UuaD4KKwordXNpbmcg V1RGOjpSYW5nZTsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CkBA IC0zNTcsNiArMzYwLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nl c3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKIHsKICAgICBBU1NFUlQo bGluZUNvbnRlbnQudmlzdWFsT3JkZXJMaXN0LnNpemUoKSA9PSBsaW5lQ29udGVudC5ydW5zLnNp emUoKSk7CiAKKyAgICBWZWN0b3I8UmFuZ2U8c2l6ZV90Pj4gaW5saW5lQm94UmFuZ2VMaXN0Owog ICAgIGF1dG8gbmVlZHNOb25Sb290SW5saW5lQm94RGlzcGxheUJveCA9IGZhbHNlOwogICAgIGF1 dG8gY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1YWxPcmRlckZvckNvbnRlbnRSdW5zID0gWyZdIHsK ICAgICAgICAgYXV0byByb290SW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNhbFJlY3RGb3JS b290SW5saW5lQm94KCk7CkBAIC00NTcsNiArNDYxLDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKIAogICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZl cnNlZFJhbmdlKGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2UpKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmNvbnRhaW5zKGlubGluZUJv eCkpOworICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0LmFwcGVuZCh7 IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KGlubGluZUJveCksIGluZGV4IH0pOwogICAgICAg ICAgICAgICAgICAgICAgICAgcGFyZW50Qm94U3RhY2sucmVtb3ZlKGlubGluZUJveCk7CiAgICAg ICAgICAgICAgICAgICAgIH0KIApAQCAtNDk4LDExICs1MDQsMTggQEAgdm9pZCBJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6 TGluZUNvbnQKICAgICAgICAgICAgICAgICBpbmxpbmVCb3hOZWVkaW5nRGlzcGxheUJveExpc3Qu YXBwZW5kKGFuY2VzdG9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICAvLyAi Q2xvc2UiIHRoZSByZW1haW5pbmcgaW5saW5lIGJveGVzIG9uIHRoZSBzdGFjayAoZXhjbHVkaW5n IHRoZSByb290KS4KKyAgICAgICAgd2hpbGUgKHBhcmVudEJveFN0YWNrLnNpemUoKSA+IDEpIHsK KyAgICAgICAgICAgIGF1dG8qIHBhcmVudElubGluZUJveCA9IHBhcmVudEJveFN0YWNrLnRha2VM YXN0KCk7CisgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94RGlzcGxheUJveE1hcC5jb250YWlu cyhwYXJlbnRJbmxpbmVCb3gpKTsKKyAgICAgICAgICAgIGlubGluZUJveFJhbmdlTGlzdC5hcHBl bmQoeyBpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmdldChwYXJlbnRJbmxpbmVCb3gpLCBib3hlcy5z aXplKCkgfSk7CisgICAgICAgIH0KICAgICB9OwogICAgIGlmIChuZWVkc05vblJvb3RJbmxpbmVC b3hEaXNwbGF5Qm94KQogICAgICAgICBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9y SW5saW5lQm94ZXMoKTsKIAogICAgIGF1dG8gYWRqdXN0VmlzdWFsR2VvbWV0cnlXaXRoSW5saW5l Qm94ZXMgPSBbJl0geworICAgICAgICBzaXplX3QgY3VycmVudElubGluZUJveCA9IDA7CiAgICAg ICAgIGF1dG8gYWNjdW11bGF0ZWRPZmZzZXQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKIAogICAg ICAgICBBU1NFUlQoYm94ZXNbMF0uaXNSb290SW5saW5lQm94KCkpOwpAQCAtNTEwLDggKzUyMywy MiBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50 KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgYXV0byYgZGlzcGxheUJv eCA9IGJveGVzW2luZGV4XTsKICAgICAgICAgICAgIGRpc3BsYXlCb3gubW92ZUhvcml6b250YWxs eShhY2N1bXVsYXRlZE9mZnNldCk7CiAKKyAgICAgICAgICAgIHdoaWxlIChjdXJyZW50SW5saW5l Qm94IDwgaW5saW5lQm94UmFuZ2VMaXN0LnNpemUoKSAmJiBpbmRleCA9PSBpbmxpbmVCb3hSYW5n ZUxpc3RbY3VycmVudElubGluZUJveF0uZW5kKCkgLSAxKSB7CisgICAgICAgICAgICAgICAgLy8g V2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGlubGluZSBib3ggY29udGVudC4KKyAgICAgICAgICAg ICAgICAvLyBMZXQncyBjb21wdXRlIHRoZSBpbmxpbmUgYm94IHdpZHRoIGFuZCBvZmZzZXQgdGhl IHJlc3Qgb2YgdGhlIGNvbnRlbnQgd2l0aCBwYWRkaW5nL2JvcmRlci9tYXJnaW4gZW5kLgorICAg ICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94UmFuZ2UgPSBpbmxpbmVCb3hSYW5nZUxpc3RbY3Vy cmVudElubGluZUJveCsrXTsKKyAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3hEaXNwbGF5 Qm94ID0gYm94ZXNbaW5saW5lQm94UmFuZ2UuYmVnaW4oKV07CisgICAgICAgICAgICAgICAgQVNT RVJUKGlubGluZUJveERpc3BsYXlCb3guaXNOb25Sb290SW5saW5lQm94KCkpOworCisgICAgICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRy eShpbmxpbmVCb3hEaXNwbGF5Qm94LmxheW91dEJveCgpKTsKKyAgICAgICAgICAgICAgICBhdXRv IGNvbnRlbnRSaWdodCA9IGRpc3BsYXlCb3gubG9naWNhbFJpZ2h0KCk7CisgICAgICAgICAgICAg ICAgaWYgKGlubGluZUJveERpc3BsYXlCb3guaXNMYXN0Qm94KCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgYWNjdW11bGF0ZWRPZmZzZXQgKz0gYm94R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ0Vu ZCgpICsgYm94R2VvbWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAgICAgIGlubGlu ZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJpZ2h0KGNvbnRlbnRSaWdodCArIGJveEdlb21ldHJ5 LmJvcmRlckFuZFBhZGRpbmdFbmQoKSk7CisgICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJpZ2h0KGNvbnRlbnRS aWdodCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoZGlzcGxheUJveC5pc05vblJv b3RJbmxpbmVCb3goKSAmJiBkaXNwbGF5Qm94LmlzRmlyc3RCb3goKSkgewotICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgdGhlICdlbmQnIHNpZGUgb2YgdGhlIGlubGlu ZSBib3guCiAgICAgICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gZGlzcGxheUJveC5sYXlv dXRCb3goKTsKICAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdT dGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv ZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKaW5kZXggMzk4NzA4Y2Y1OTg3NDlmZTIwNmVlYzM2 MzdhZDdjYzdlZjAxMzJmZi4uNGU1YTkxNDlmZjZiNzJiOTYxZTMzYTRhM2UzMWI5ZDNiNjI1Yzk1 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgK QEAgLTEwOSw2ICsxMDksNyBAQCBzdHJ1Y3QgQm94IHsKICAgICB2b2lkIG1vdmVIb3Jpem9udGFs bHkoTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IG9mZnNldCkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVI b3Jpem9udGFsbHkob2Zmc2V0KTsgfQogICAgIHZvaWQgYWRqdXN0SW5rT3ZlcmZsb3coY29uc3Qg TGF5b3V0OjpJbmxpbmVSZWN0JiBjaGlsZEJvcmRlckJveCkgeyByZXR1cm4gbV9pbmtPdmVyZmxv dy5leHBhbmRUb0NvbnRhaW4oY2hpbGRCb3JkZXJCb3gpOyB9CiAgICAgdm9pZCB0cnVuY2F0ZShM YXlvdXQ6OklubGluZUxheW91dFVuaXQgdHJ1bmNhdGVkd2lkdGggPSAwLmYpOworICAgIHZvaWQg c2V0TG9naWNhbFJpZ2h0KExheW91dDo6SW5saW5lTGF5b3V0VW5pdCByaWdodCkgeyBtX2xvZ2lj YWxSZWN0LnNldFJpZ2h0KHJpZ2h0KTsgfQogCiAgICAgc3RkOjpvcHRpb25hbDxUZXh0PiYgdGV4 dCgpIHsgcmV0dXJuIG1fdGV4dDsgfQogICAgIGNvbnN0IHN0ZDo6b3B0aW9uYWw8VGV4dD4mIHRl eHQoKSBjb25zdCB7IHJldHVybiBtX3RleHQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3hHZW9tZXRyeS5oCmluZGV4IDhjZTdkZGU3MDMzMWIz ZGY3ODFjODhlMjVlMDUzMGExYjBkMjIyMjEuLjg1ZmFmOGM4ZTY3ODMwMTg5OWJhZjU4OTAyNDUx MzFlYzNlY2YwN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVl L0xheW91dEJveEdlb21ldHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94R2VvbWV0cnkuaApAQCAtNzgsNyArNzgsOCBAQCBwdWJsaWM6CiAgICAgc3Rk OjpvcHRpb25hbDxMYXlvdXRVbml0PiBob3Jpem9udGFsUGFkZGluZygpIGNvbnN0OwogCiAgICAg SW5saW5lTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nU3RhcnQoKSBjb25zdCB7IHJldHVybiBi b3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpLnZhbHVlX29yKDApOyB9Ci0gICAgCisgICAgSW5s aW5lTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nRW5kKCkgY29uc3QgeyByZXR1cm4gYm9yZGVy UmlnaHQoKSArIHBhZGRpbmdSaWdodCgpLnZhbHVlX29yKDApOyB9CisKICAgICBMYXlvdXRVbml0 IGNvbnRlbnRCb3hUb3AoKSBjb25zdCB7IHJldHVybiBwYWRkaW5nQm94VG9wKCkgKyBwYWRkaW5n VG9wKCkudmFsdWVfb3IoMCk7IH0KICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hMZWZ0KCkgY29u c3QgeyByZXR1cm4gcGFkZGluZ0JveExlZnQoKSArIHBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7 IH0KICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hCb3R0b20oKSBjb25zdCB7IHJldHVybiBjb250 ZW50Qm94VG9wKCkgKyBjb250ZW50Qm94SGVpZ2h0KCk7IH0K 445660 2021-12-01 20:09:29 -0800 2021-12-01 20:14:03 -0800 Patch bug-233744-20211201200928.patch text/plain 7325 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E0NzY3OTZkZTllZGZk M2Y4MjQ2MzI2ZjQ4N2M1YTEzMWJmNDliYS4uMDgyMGJiYzc1NzZhMjE2MjVjZTRhMTJkM2I3ZGNm YjRjY2ViNmI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzc0NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAgdHJhY2sgb2YgdGhlIGlubGluZSBib3gg cmFuZ2UgaW4gdGhlIGNvbnRleHQgb2YgZGlzcGxheSBib3hlcyBzbyB0aGF0IHdlIGNhbiBhZGp1 c3QgdGhlIGNvbnRlbnQgaG9yaXpvbnRhbGx5CisgICAgICAgIHdpdGggdGhlIG1hcmdpbi9ib3Jk ZXIvcGFkZGluZyBlbmQgb2YgdGhlICJsYXN0IiBpbmxpbmUgYm94LgorICAgICAgICBXZSBhbHNv IHNldCB0aGUgd2lkdGggb2YgdGhlIChmcmFnbWVudGVkIGlubGluZSBib3ggdHlwZSBvZikgZGlz cGxheSBib3hlcyBoZXJlIGJhc2VkIG9uIHRoZWlyIGNvbnRlbnQgcmlnaHQgcG9zaXRpb24uCisK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpCb3g6OnNldExvZ2ljYWxSaWdodCk6Cisg ICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckFuZFBhZGRpbmdFbmQgY29uc3Qp OgorCiAyMDIxLTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIFNldCB0aGUgZmlyc3QvbGFzdCBib3ggZmxhZyBvbiB0aGUgKGJpZGkgZnJh Z21lbnRlZCkgaW5saW5lIGJveCB0eXBlIG9mIGRpc3BsYXkgYm94ZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGFiOGEz YzM0MmFjMWM4NDE1YzUxMjg3M2VlM2ZjODc3NDQzYWUyNjkuLmJkMjAyNTBlNTQ5NmM2MTBkMGQy MGVkNzZjODUxODQxMDc2ZGRhNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzQsNiArMzQsOSBAQAogI2luY2x1ZGUg IlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJUZXh0VXRpbC5oIgogI2luY2x1 ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgorI2luY2x1ZGUgPHd0Zi9SYW5nZS5oPgorCit1c2luZyBX VEY6OlJhbmdlOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAg LTM1Nyw2ICszNjAsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogewogICAgIEFTU0VSVChs aW5lQ29udGVudC52aXN1YWxPcmRlckxpc3Quc2l6ZSgpID09IGxpbmVDb250ZW50LnJ1bnMuc2l6 ZSgpKTsKIAorICAgIFZlY3RvcjxSYW5nZTxzaXplX3Q+PiBpbmxpbmVCb3hSYW5nZUxpc3Q7CiAg ICAgYXV0byBuZWVkc05vblJvb3RJbmxpbmVCb3hEaXNwbGF5Qm94ID0gZmFsc2U7CiAgICAgYXV0 byBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVudFJ1bnMgPSBbJl0gewog ICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclJv b3RJbmxpbmVCb3goKTsKQEAgLTQ1Nyw2ICs0NjEsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29u dAogCiAgICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byogaW5saW5lQm94IDogbWFrZVJldmVy c2VkUmFuZ2UoaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZSkpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgQVNTRVJUKGlubGluZUJveERpc3BsYXlCb3hNYXAuY29udGFpbnMoaW5saW5lQm94 KSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hSYW5nZUxpc3QuYXBwZW5kKHsg aW5saW5lQm94RGlzcGxheUJveE1hcC5nZXQoaW5saW5lQm94KSwgaW5kZXggfSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICBwYXJlbnRCb3hTdGFjay5yZW1vdmUoaW5saW5lQm94KTsKICAgICAg ICAgICAgICAgICAgICAgfQogCkBAIC00OTgsMTEgKzUwNCwxOCBAQCB2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpM aW5lQ29udAogICAgICAgICAgICAgICAgIGlubGluZUJveE5lZWRpbmdEaXNwbGF5Qm94TGlzdC5h cHBlbmQoYW5jZXN0b3IpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIC8vICJD bG9zZSIgdGhlIHJlbWFpbmluZyBpbmxpbmUgYm94ZXMgb24gdGhlIHN0YWNrIChleGNsdWRpbmcg dGhlIHJvb3QpLgorICAgICAgICB3aGlsZSAocGFyZW50Qm94U3RhY2suc2l6ZSgpID4gMSkgewor ICAgICAgICAgICAgYXV0byogcGFyZW50SW5saW5lQm94ID0gcGFyZW50Qm94U3RhY2sudGFrZUxh c3QoKTsKKyAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmNvbnRhaW5z KHBhcmVudElubGluZUJveCkpOworICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0LmFwcGVu ZCh7IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KHBhcmVudElubGluZUJveCksIGJveGVzLnNp emUoKSB9KTsKKyAgICAgICAgfQogICAgIH07CiAgICAgaWYgKG5lZWRzTm9uUm9vdElubGluZUJv eERpc3BsYXlCb3gpCiAgICAgICAgIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJ bmxpbmVCb3hlcygpOwogCiAgICAgYXV0byBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJbmxpbmVC b3hlcyA9IFsmXSB7CisgICAgICAgIHNpemVfdCBjdXJyZW50SW5saW5lQm94ID0gMDsKICAgICAg ICAgYXV0byBhY2N1bXVsYXRlZE9mZnNldCA9IElubGluZUxheW91dFVuaXQgeyB9OwogCiAgICAg ICAgIEFTU0VSVChib3hlc1swXS5pc1Jvb3RJbmxpbmVCb3goKSk7CkBAIC01MTAsOCArNTIzLDIy IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQo Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94 ID0gYm94ZXNbaW5kZXhdOwogICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5 KGFjY3VtdWxhdGVkT2Zmc2V0KTsKIAorICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVC b3ggPCBpbmxpbmVCb3hSYW5nZUxpc3Quc2l6ZSgpICYmIGluZGV4ID09IGlubGluZUJveFJhbmdl TGlzdFtjdXJyZW50SW5saW5lQm94XS5lbmQoKSAtIDEpIHsKKyAgICAgICAgICAgICAgICAvLyBX ZSBhcmUgYXQgdGhlIGVuZCBvZiB0aGUgaW5saW5lIGJveCBjb250ZW50LgorICAgICAgICAgICAg ICAgIC8vIExldCdzIGNvbXB1dGUgdGhlIGlubGluZSBib3ggd2lkdGggYW5kIG9mZnNldCB0aGUg cmVzdCBvZiB0aGUgY29udGVudCB3aXRoIHBhZGRpbmcvYm9yZGVyL21hcmdpbiBlbmQuCisgICAg ICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hSYW5nZSA9IGlubGluZUJveFJhbmdlTGlzdFtjdXJy ZW50SW5saW5lQm94KytdOworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveERpc3BsYXlC b3ggPSBib3hlc1tpbmxpbmVCb3hSYW5nZS5iZWdpbigpXTsKKyAgICAgICAgICAgICAgICBBU1NF UlQoaW5saW5lQm94RGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKSk7CisKKyAgICAgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5 KGlubGluZUJveERpc3BsYXlCb3gubGF5b3V0Qm94KCkpOworICAgICAgICAgICAgICAgIGF1dG8g Y29udGVudFJpZ2h0ID0gZGlzcGxheUJveC5sb2dpY2FsUmlnaHQoKTsKKyAgICAgICAgICAgICAg ICBpZiAoaW5saW5lQm94RGlzcGxheUJveC5pc0xhc3RCb3goKSkgeworICAgICAgICAgICAgICAg ICAgICBhY2N1bXVsYXRlZE9mZnNldCArPSBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nRW5k KCkgKyBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKKyAgICAgICAgICAgICAgICAgICAgaW5saW5l Qm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJpZ2h0ICsgYm94R2VvbWV0cnku Ym9yZGVyQW5kUGFkZGluZ0VuZCgpKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgaW5saW5lQm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJp Z2h0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChkaXNwbGF5Qm94LmlzTm9uUm9v dElubGluZUJveCgpICYmIGRpc3BsYXlCb3guaXNGaXJzdEJveCgpKSB7Ci0gICAgICAgICAgICAg ICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciB0aGUgJ2VuZCcgc2lkZSBvZiB0aGUgaW5saW5l IGJveC4KICAgICAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBkaXNwbGF5Qm94LmxheW91 dEJveCgpOwogICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5 Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9k aXNwbGF5L0lubGluZURpc3BsYXlCb3guaAppbmRleCAzOTg3MDhjZjU5ODc0OWZlMjA2ZWVjMzYz N2FkN2NjN2VmMDEzMmZmLi40ZTVhOTE0OWZmNmI3MmI5NjFlMzNhNGEzZTMxYjlkM2I2MjVjOTU0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaApA QCAtMTA5LDYgKzEwOSw3IEBAIHN0cnVjdCBCb3ggewogICAgIHZvaWQgbW92ZUhvcml6b250YWxs eShMYXlvdXQ6OklubGluZUxheW91dFVuaXQgb2Zmc2V0KSB7IG1fbG9naWNhbFJlY3QubW92ZUhv cml6b250YWxseShvZmZzZXQpOyB9CiAgICAgdm9pZCBhZGp1c3RJbmtPdmVyZmxvdyhjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIGNoaWxkQm9yZGVyQm94KSB7IHJldHVybiBtX2lua092ZXJmbG93 LmV4cGFuZFRvQ29udGFpbihjaGlsZEJvcmRlckJveCk7IH0KICAgICB2b2lkIHRydW5jYXRlKExh eW91dDo6SW5saW5lTGF5b3V0VW5pdCB0cnVuY2F0ZWR3aWR0aCA9IDAuZik7CisgICAgdm9pZCBz ZXRMb2dpY2FsUmlnaHQoTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IHJpZ2h0KSB7IG1fbG9naWNh bFJlY3Quc2V0UmlnaHQocmlnaHQpOyB9CiAKICAgICBzdGQ6Om9wdGlvbmFsPFRleHQ+JiB0ZXh0 KCkgeyByZXR1cm4gbV90ZXh0OyB9CiAgICAgY29uc3Qgc3RkOjpvcHRpb25hbDxUZXh0PiYgdGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKaW5kZXggOGNlN2RkZTcwMzMxYjNk Zjc4MWM4OGUyNWUwNTMwYTFiMGQyMjIyMS4uNTUyOTUxMDJiNTdjMzg1YmFlNzEzMzM2NzU0N2Nm NWUxZTI4NzBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Qm94R2VvbWV0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRCb3hHZW9tZXRyeS5oCkBAIC03OCw3ICs3OCw4IEBAIHB1YmxpYzoKICAgICBzdGQ6 Om9wdGlvbmFsPExheW91dFVuaXQ+IGhvcml6b250YWxQYWRkaW5nKCkgY29uc3Q7CiAKICAgICBJ bmxpbmVMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdTdGFydCgpIGNvbnN0IHsgcmV0dXJuIGJv cmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7IH0KLSAgICAKKyAgICBMYXlv dXRVbml0IGJvcmRlckFuZFBhZGRpbmdFbmQoKSBjb25zdCB7IHJldHVybiBib3JkZXJSaWdodCgp ICsgcGFkZGluZ1JpZ2h0KCkudmFsdWVfb3IoMCk7IH0KKwogICAgIExheW91dFVuaXQgY29udGVu dEJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIHBhZGRpbmdCb3hUb3AoKSArIHBhZGRpbmdUb3AoKS52 YWx1ZV9vcigwKTsgfQogICAgIExheW91dFVuaXQgY29udGVudEJveExlZnQoKSBjb25zdCB7IHJl dHVybiBwYWRkaW5nQm94TGVmdCgpICsgcGFkZGluZ0xlZnQoKS52YWx1ZV9vcigwKTsgfQogICAg IExheW91dFVuaXQgY29udGVudEJveEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRCb3hU b3AoKSArIGNvbnRlbnRCb3hIZWlnaHQoKTsgfQo= 445663 2021-12-01 20:14:06 -0800 2021-12-03 15:42:53 -0800 Patch bug-233744-20211201201405.patch text/plain 7223 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E0NzY3OTZkZTllZGZk M2Y4MjQ2MzI2ZjQ4N2M1YTEzMWJmNDliYS4uMDgyMGJiYzc1NzZhMjE2MjVjZTRhMTJkM2I3ZGNm YjRjY2ViNmI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1vdmUgdGhl IChiaWRpKWRpc3BsYXkgYm94ZXMgaG9yaXpvbnRhbGx5IGJ5IHRoZSBpbmxpbmUgYm94IG1hcmdp biwgYm9yZGVyIGFuZCBwYWRkaW5nIGVuZCBhcyBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzc0NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAgdHJhY2sgb2YgdGhlIGlubGluZSBib3gg cmFuZ2UgaW4gdGhlIGNvbnRleHQgb2YgZGlzcGxheSBib3hlcyBzbyB0aGF0IHdlIGNhbiBhZGp1 c3QgdGhlIGNvbnRlbnQgaG9yaXpvbnRhbGx5CisgICAgICAgIHdpdGggdGhlIG1hcmdpbi9ib3Jk ZXIvcGFkZGluZyBlbmQgb2YgdGhlICJsYXN0IiBpbmxpbmUgYm94LgorICAgICAgICBXZSBhbHNv IHNldCB0aGUgd2lkdGggb2YgdGhlIChmcmFnbWVudGVkIGlubGluZSBib3ggdHlwZSBvZikgZGlz cGxheSBib3hlcyBoZXJlIGJhc2VkIG9uIHRoZWlyIGNvbnRlbnQgcmlnaHQgcG9zaXRpb24uCisK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpCb3g6OnNldExvZ2ljYWxSaWdodCk6Cisg ICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Qm94R2VvbWV0cnk6OmJvcmRlckFuZFBhZGRpbmdFbmQgY29uc3Qp OgorCiAyMDIxLTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIFNldCB0aGUgZmlyc3QvbGFzdCBib3ggZmxhZyBvbiB0aGUgKGJpZGkgZnJh Z21lbnRlZCkgaW5saW5lIGJveCB0eXBlIG9mIGRpc3BsYXkgYm94ZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGFiOGEz YzM0MmFjMWM4NDE1YzUxMjg3M2VlM2ZjODc3NDQzYWUyNjkuLmJkMjAyNTBlNTQ5NmM2MTBkMGQy MGVkNzZjODUxODQxMDc2ZGRhNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMzQsNiArMzQsOSBAQAogI2luY2x1ZGUg IlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJUZXh0VXRpbC5oIgogI2luY2x1 ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgorI2luY2x1ZGUgPHd0Zi9SYW5nZS5oPgorCit1c2luZyBX VEY6OlJhbmdlOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAg LTM1Nyw2ICszNjAsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogewogICAgIEFTU0VSVChs aW5lQ29udGVudC52aXN1YWxPcmRlckxpc3Quc2l6ZSgpID09IGxpbmVDb250ZW50LnJ1bnMuc2l6 ZSgpKTsKIAorICAgIFZlY3RvcjxSYW5nZTxzaXplX3Q+PiBpbmxpbmVCb3hSYW5nZUxpc3Q7CiAg ICAgYXV0byBuZWVkc05vblJvb3RJbmxpbmVCb3hEaXNwbGF5Qm94ID0gZmFsc2U7CiAgICAgYXV0 byBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9yQ29udGVudFJ1bnMgPSBbJl0gewog ICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclJv b3RJbmxpbmVCb3goKTsKQEAgLTQ1Nyw2ICs0NjEsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29u dAogCiAgICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byogaW5saW5lQm94IDogbWFrZVJldmVy c2VkUmFuZ2UoaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZSkpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgQVNTRVJUKGlubGluZUJveERpc3BsYXlCb3hNYXAuY29udGFpbnMoaW5saW5lQm94 KSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hSYW5nZUxpc3QuYXBwZW5kKHsg aW5saW5lQm94RGlzcGxheUJveE1hcC5nZXQoaW5saW5lQm94KSwgaW5kZXggfSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICBwYXJlbnRCb3hTdGFjay5yZW1vdmUoaW5saW5lQm94KTsKICAgICAg ICAgICAgICAgICAgICAgfQogCkBAIC00OTgsMTEgKzUwNCwxOCBAQCB2b2lkIElubGluZURpc3Bs YXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpM aW5lQ29udAogICAgICAgICAgICAgICAgIGlubGluZUJveE5lZWRpbmdEaXNwbGF5Qm94TGlzdC5h cHBlbmQoYW5jZXN0b3IpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIC8vICJD bG9zZSIgdGhlIHJlbWFpbmluZyBpbmxpbmUgYm94ZXMgb24gdGhlIHN0YWNrIChleGNsdWRpbmcg dGhlIHJvb3QpLgorICAgICAgICB3aGlsZSAocGFyZW50Qm94U3RhY2suc2l6ZSgpID4gMSkgewor ICAgICAgICAgICAgYXV0byogcGFyZW50SW5saW5lQm94ID0gcGFyZW50Qm94U3RhY2sudGFrZUxh c3QoKTsKKyAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmNvbnRhaW5z KHBhcmVudElubGluZUJveCkpOworICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0LmFwcGVu ZCh7IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KHBhcmVudElubGluZUJveCksIGJveGVzLnNp emUoKSB9KTsKKyAgICAgICAgfQogICAgIH07CiAgICAgaWYgKG5lZWRzTm9uUm9vdElubGluZUJv eERpc3BsYXlCb3gpCiAgICAgICAgIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJ bmxpbmVCb3hlcygpOwogCiAgICAgYXV0byBhZGp1c3RWaXN1YWxHZW9tZXRyeVdpdGhJbmxpbmVC b3hlcyA9IFsmXSB7CisgICAgICAgIHNpemVfdCBjdXJyZW50SW5saW5lQm94ID0gMDsKICAgICAg ICAgYXV0byBhY2N1bXVsYXRlZE9mZnNldCA9IElubGluZUxheW91dFVuaXQgeyB9OwogCiAgICAg ICAgIEFTU0VSVChib3hlc1swXS5pc1Jvb3RJbmxpbmVCb3goKSk7CkBAIC01MTAsOCArNTIzLDIy IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQo Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94 ID0gYm94ZXNbaW5kZXhdOwogICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5 KGFjY3VtdWxhdGVkT2Zmc2V0KTsKIAorICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVC b3ggPCBpbmxpbmVCb3hSYW5nZUxpc3Quc2l6ZSgpICYmIGluZGV4ID09IGlubGluZUJveFJhbmdl TGlzdFtjdXJyZW50SW5saW5lQm94XS5lbmQoKSAtIDEpIHsKKyAgICAgICAgICAgICAgICAvLyBX ZSBhcmUgYXQgdGhlIGVuZCBvZiB0aGUgaW5saW5lIGJveCBjb250ZW50LgorICAgICAgICAgICAg ICAgIC8vIExldCdzIGNvbXB1dGUgdGhlIGlubGluZSBib3ggd2lkdGggYW5kIG9mZnNldCB0aGUg cmVzdCBvZiB0aGUgY29udGVudCB3aXRoIHBhZGRpbmcvYm9yZGVyL21hcmdpbiBlbmQuCisgICAg ICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hSYW5nZSA9IGlubGluZUJveFJhbmdlTGlzdFtjdXJy ZW50SW5saW5lQm94KytdOworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveERpc3BsYXlC b3ggPSBib3hlc1tpbmxpbmVCb3hSYW5nZS5iZWdpbigpXTsKKyAgICAgICAgICAgICAgICBBU1NF UlQoaW5saW5lQm94RGlzcGxheUJveC5pc05vblJvb3RJbmxpbmVCb3goKSk7CisKKyAgICAgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5 KGlubGluZUJveERpc3BsYXlCb3gubGF5b3V0Qm94KCkpOworICAgICAgICAgICAgICAgIGF1dG8g Y29udGVudFJpZ2h0ID0gZGlzcGxheUJveC5sb2dpY2FsUmlnaHQoKTsKKyAgICAgICAgICAgICAg ICBpZiAoaW5saW5lQm94RGlzcGxheUJveC5pc0xhc3RCb3goKSkgeworICAgICAgICAgICAgICAg ICAgICBhY2N1bXVsYXRlZE9mZnNldCArPSBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nRW5k KCkgKyBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKKyAgICAgICAgICAgICAgICAgICAgaW5saW5l Qm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJpZ2h0ICsgYm94R2VvbWV0cnku Ym9yZGVyQW5kUGFkZGluZ0VuZCgpKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgaW5saW5lQm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJp Z2h0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChkaXNwbGF5Qm94LmlzTm9uUm9v dElubGluZUJveCgpICYmIGRpc3BsYXlCb3guaXNGaXJzdEJveCgpKSB7Ci0gICAgICAgICAgICAg ICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciB0aGUgJ2VuZCcgc2lkZSBvZiB0aGUgaW5saW5l IGJveC4KICAgICAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBkaXNwbGF5Qm94LmxheW91 dEJveCgpOwogICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5 Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9k aXNwbGF5L0lubGluZURpc3BsYXlCb3guaAppbmRleCAzOTg3MDhjZjU5ODc0OWZlMjA2ZWVjMzYz N2FkN2NjN2VmMDEzMmZmLi40ZTVhOTE0OWZmNmI3MmI5NjFlMzNhNGEzZTMxYjlkM2I2MjVjOTU0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaApA QCAtMTA5LDYgKzEwOSw3IEBAIHN0cnVjdCBCb3ggewogICAgIHZvaWQgbW92ZUhvcml6b250YWxs eShMYXlvdXQ6OklubGluZUxheW91dFVuaXQgb2Zmc2V0KSB7IG1fbG9naWNhbFJlY3QubW92ZUhv cml6b250YWxseShvZmZzZXQpOyB9CiAgICAgdm9pZCBhZGp1c3RJbmtPdmVyZmxvdyhjb25zdCBM YXlvdXQ6OklubGluZVJlY3QmIGNoaWxkQm9yZGVyQm94KSB7IHJldHVybiBtX2lua092ZXJmbG93 LmV4cGFuZFRvQ29udGFpbihjaGlsZEJvcmRlckJveCk7IH0KICAgICB2b2lkIHRydW5jYXRlKExh eW91dDo6SW5saW5lTGF5b3V0VW5pdCB0cnVuY2F0ZWR3aWR0aCA9IDAuZik7CisgICAgdm9pZCBz ZXRMb2dpY2FsUmlnaHQoTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IHJpZ2h0KSB7IG1fbG9naWNh bFJlY3Quc2V0UmlnaHQocmlnaHQpOyB9CiAKICAgICBzdGQ6Om9wdGlvbmFsPFRleHQ+JiB0ZXh0 KCkgeyByZXR1cm4gbV90ZXh0OyB9CiAgICAgY29uc3Qgc3RkOjpvcHRpb25hbDxUZXh0PiYgdGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94R2VvbWV0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dEJveEdlb21ldHJ5LmgKaW5kZXggZjE5OWFkMmI1MTI3NmEw NDliMmEyNjU3ZjcyMjljMTY3NzVkOTYzZC4uYTRlYjg2NDM4YjgxNGZhZGU1MjAyZDE3MDFkMWYx ZjYwMzMyOWE4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Qm94R2VvbWV0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRCb3hHZW9tZXRyeS5oCkBAIC03OCw2ICs3OCw3IEBAIHB1YmxpYzoKICAgICBzdGQ6 Om9wdGlvbmFsPExheW91dFVuaXQ+IGhvcml6b250YWxQYWRkaW5nKCkgY29uc3Q7CiAKICAgICBM YXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdTdGFydCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlckxl ZnQoKSArIHBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7IH0KKyAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmdFbmQoKSBjb25zdCB7IHJldHVybiBib3JkZXJSaWdodCgpICsgcGFkZGluZ1Jp Z2h0KCkudmFsdWVfb3IoMCk7IH0KIAogICAgIExheW91dFVuaXQgY29udGVudEJveFRvcCgpIGNv bnN0IHsgcmV0dXJuIHBhZGRpbmdCb3hUb3AoKSArIHBhZGRpbmdUb3AoKS52YWx1ZV9vcigwKTsg fQogICAgIExheW91dFVuaXQgY29udGVudEJveExlZnQoKSBjb25zdCB7IHJldHVybiBwYWRkaW5n Qm94TGVmdCgpICsgcGFkZGluZ0xlZnQoKS52YWx1ZV9vcigwKTsgfQo=