233855 2021-12-04 19:53:25 -0800 [LFC][IFC] createDisplayBoxesInVisualOrderForInlineBoxes could use less nesting 2021-12-09 10:26:23 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 zalan zalan bfulgham simon.fraser zalan oldest_to_newest 1820473 0 zalan 2021-12-04 19:53:25 -0800 just moving code around 1820474 1 445973 zalan 2021-12-04 19:55:50 -0800 Created attachment 445973 Patch 1820477 2 445975 zalan 2021-12-04 20:12:34 -0800 Created attachment 445975 Patch 1822175 3 zalan 2021-12-09 10:26:23 -0800 went with a different approach 445973 2021-12-04 19:55:50 -0800 2021-12-04 20:12:32 -0800 Patch bug-233855-20211204195549.patch text/plain 8818 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlNTQxYmQ0MmRlNDY2 ODQyYjJhYjViMjEwN2YyZTc3YmFjMDJlNy4uZDJiYWRkYWY4MGVmMDE4MWEyNDgxOTgwOWVhNmZm MDI0ZGM0YWNhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIGNyZWF0ZURp c3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJbmxpbmVCb3hlcyBjb3VsZCB1c2UgbGVzcyBuZXN0 aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM4 NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3N0 bHkgbW92aW5nIGNvZGUgYXJvdW5kIGFuZCB1c2luZyBiZXR0ZXIgdmFyaWFibGUgbmFtZXMuCisK KyAgICAgICAgVGhpcyBpcyBhbHNvIGluIHByZXBhcmF0aW9uIGZvciBtYWtpbmcgdGhpcyBmdW5j dGlvbiBwYXJ0IG9mIHRoZSBpbml0aWFsIGxvb3AgaW4gY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1 YWxPcmRlckZvckNvbnRlbnRSdW5zLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNv bnRlbnQpOgorCiAyMDIxLTEyLTA0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIENvbXB1dGUgaXNGaXJzdEJveC9pc0xhc3RCb3ggZm9yIHRleHQg Y29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5jcHAKaW5kZXggNzk3YWMwMzE4MTg5ZTJkNTQxMmFjNmIwYTE2OTFlZmQyZGNlZmY5 Zi4uOTdmOWU3YzhkZjE0MDc2MDgwYjM5Njc0YjI4NDgyNDQ1NzI3YmQwYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC00 NDksNjIgKzQ0OSw2MSBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgICAg IC8vIFdlJ3ZlIGdvdCB0aGUgY29ycmVjdCBpbmxpbmUgYm94IGFzIHBhcmVudC4gTm90aGluZyB0 byBkbyBoZXJlLgogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgYXV0byBwYXJlbnRCb3hTdGFja0VuZCA9IHBhcmVudEJveFN0YWNrLmVuZCgpOwor CiAgICAgICAgICAgICBWZWN0b3I8Y29uc3QgQm94Kj4gaW5saW5lQm94TmVlZGluZ0Rpc3BsYXlC b3hMaXN0OworICAgICAgICAgICAgYXV0byBhbmNlc3RvckNoYWluRW5kID0gcGFyZW50Qm94U3Rh Y2suZW5kKCk7CisgICAgICAgICAgICBhdXRvIGxvd2VzdENvbW1vbkFuY2VzdG9yID0gYW5jZXN0 b3JDaGFpbkVuZDsKICAgICAgICAgICAgIGZvciAoYXV0byogYW5jZXN0b3IgPSAmcGFyZW50Qm94 OyBhbmNlc3RvcjsgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7Ci0gICAgICAgICAg ICAgICAgQVNTRVJUKGFuY2VzdG9yID09ICZyb290KCkgfHwgYW5jZXN0b3ItPmlzSW5saW5lQm94 KCkpOwotICAgICAgICAgICAgICAgIGF1dG8gcGFyZW50Qm94SXRlcmF0b3IgPSBwYXJlbnRCb3hT dGFjay5maW5kKGFuY2VzdG9yKTsKLSAgICAgICAgICAgICAgICBpZiAocGFyZW50Qm94SXRlcmF0 b3IgIT0gcGFyZW50Qm94U3RhY2tFbmQpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBp cyB0aGUgbG93ZXN0IGNvbW1vbiBhbmNlc3Rvci4KLSAgICAgICAgICAgICAgICAgICAgLy8gTGV0 J3MgdHJhdmVyc2UgYm90aCBhbmNlc3RvciBjaGFpbnMgYW5kIGNyZWF0ZS9jbG9zZSBkaXNwbGF5 IGJveGVzIGFzIG5lZWRlZC4KLSAgICAgICAgICAgICAgICAgICAgVmVjdG9yPGNvbnN0IEJveCo+ IGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2U7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAoYXV0 byBpdCA9ICsrcGFyZW50Qm94SXRlcmF0b3I7IGl0ICE9IHBhcmVudEJveFN0YWNrRW5kOyArK2l0 KQotICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZS5hcHBl bmQoKml0KTsKLQotICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1h a2VSZXZlcnNlZFJhbmdlKGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2UpKSB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLmNvbnRhaW5zKGlu bGluZUJveCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0LmFw cGVuZCh7IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KGlubGluZUJveCksIGluZGV4IH0pOwot ICAgICAgICAgICAgICAgICAgICAgICAgcGFyZW50Qm94U3RhY2sucmVtb3ZlKGlubGluZUJveCk7 Ci0gICAgICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgICAgICAvLyBJbnNlcnQg bmV3IGRpc3BsYXkgYm94ZXMgZm9yIGlubGluZSBib3ggZnJhZ21lbnRzIG9uIGJpZGkgYm91bmRh cnkuCi0gICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byogaW5saW5lQm94IDogbWFrZVJldmVy c2VkUmFuZ2UoaW5saW5lQm94TmVlZGluZ0Rpc3BsYXlCb3hMaXN0KSkgewotICAgICAgICAgICAg ICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJbmxpbmVCb3goKSk7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBwYXJlbnRCb3hTdGFjay5hZGQoaW5saW5lQm94KTsKLQotICAgICAgICAg ICAgICAgICAgICAgICAgYXV0byBjcmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5lQm94 RnJhZ21lbnQgPSBbJl0gewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIE1ha2Ugc3Vy ZSB0aGF0IHRoZSAicHJldmlvdXMiIGRpc3BsYXkgYm94IGZvciB0aGlzIHBhcnRpY3VsYXIgaW5s aW5lIGJveCBpcyBub3QgdHJhY2tlZCBhcyB0aGUgImxhc3QgYm94Ii4KLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhdXRvIGxhc3REaXNwbGF5Qm94Rm9ySW5saW5lQm94SW5kZXggPSBpbmxp bmVCb3hEaXNwbGF5Qm94TWFwLnRha2UoaW5saW5lQm94KTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhdXRvIGlzRmlyc3RGcmFnbWVudCA9ICFsYXN0RGlzcGxheUJveEZvcklubGluZUJv eEluZGV4OwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghaXNGaXJzdEZyYWdtZW50 KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib3hlc1tsYXN0RGlzcGxheUJveEZv cklubGluZUJveEluZGV4XS5zZXRJc0xhc3RCb3goZmFsc2UpOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3hNYXAuc2V0KGlubGluZUJveCwgaW5kZXgpOwot Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0 aW5nU3RhdGUoKS5ib3hHZW9tZXRyeSgqaW5saW5lQm94KTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhdXRvIHZpc3VhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxp bmVCb3goKmlubGluZUJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIFVzZSB0aGUgY3VycmVudCBjb250ZW50IGxlZnQgYXMgdGhlIHN0YXJ0aW5nIHBvaW50 IGZvciB0aGlzIGRpc3BsYXkgYm94LgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc3Vh bFJlY3Quc2V0TGVmdChib3hlc1tpbmRleF0ubG9naWNhbExlZnQoKSk7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlVmVydGljYWxseShsaW5lQm94TG9naWNhbFRv cExlZnQueSgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBWaXN1YWwgd2lkdGgg aXMgbm90IHlldCBrbm93bi4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0 LnNldFdpZHRoKHsgfSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5zZXJ0SW5saW5l Qm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5 b3V0Qm94KCppbmxpbmVCb3gpLCB2aXN1YWxSZWN0LCBpc0ZpcnN0RnJhZ21lbnQsIGluZGV4LCBi b3hlcyk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKytpbmRleDsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBOZWVkIHRvIHB1c2ggdGhlIHJlc3Qgb2YgdGhlIGNvbnRlbnQg d2hlbiB0aGlzIGlubGluZSBib3ggaGFzIG1hcmdpbi9ib3JkZXIvcGFkZGluZy4KLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBuZWVkc0Rpc3BsYXlCb3hIb3Jpem9udGFsQWRqdXN0bWVudCA9 IG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3RtZW50Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB8fCBib3hHZW9tZXRyeS5ob3Jpem9udGFsUGFkZGluZygp LnZhbHVlX29yKDApCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21l dHJ5Lm1hcmdpblN0YXJ0KCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94 R2VvbWV0cnkubWFyZ2luRW5kKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9OwotICAgICAg ICAgICAgICAgICAgICAgICAgY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGluZUJveEZy YWdtZW50KCk7Ci0gICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBsb3dlc3RD b21tb25BbmNlc3RvciA9IHBhcmVudEJveFN0YWNrLmZpbmQoYW5jZXN0b3IpOworICAgICAgICAg ICAgICAgIGlmIChsb3dlc3RDb21tb25BbmNlc3RvciAhPSBhbmNlc3RvckNoYWluRW5kKQogICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgLy8gcm9vdCBtYXkgbm90IGJlIHRoZSBsb3dlc3QgYnV0IGFsd2F5cyBhIGNvbW1vbiBhbmNl c3Rvci4KLSAgICAgICAgICAgICAgICBBU1NFUlQoYW5jZXN0b3IgIT0gJnJvb3QoKSk7CiAgICAg ICAgICAgICAgICAgaW5saW5lQm94TmVlZGluZ0Rpc3BsYXlCb3hMaXN0LmFwcGVuZChhbmNlc3Rv cik7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICAvLyBUaGVyZSdzIGFsd2F5cyBhIGNvbW1v biBhbmNlc3RvciwgZWl0aGVyIGFuIGlubGluZSBib3ggb3IgdGhlIGZvcm1hdHRpbmcgY29udGV4 dCByb290LgorICAgICAgICAgICAgQVNTRVJUKGxvd2VzdENvbW1vbkFuY2VzdG9yICE9IGFuY2Vz dG9yQ2hhaW5FbmQpOworICAgICAgICAgICAgLy8gTGV0J3MgdHJhdmVyc2UgYm90aCBhbmNlc3Rv ciBjaGFpbnMgYW5kIGNyZWF0ZS9jbG9zZSBkaXNwbGF5IGJveGVzIGFzIG5lZWRlZC4KKyAgICAg ICAgICAgIFZlY3Rvcjxjb25zdCBCb3gqPiBpbmxpbmVCb3hGcmFnbWVudHNUb0Nsb3NlOworICAg ICAgICAgICAgZm9yIChhdXRvIGFuY2VzdG9yID0gKytsb3dlc3RDb21tb25BbmNlc3RvcjsgYW5j ZXN0b3IgIT0gYW5jZXN0b3JDaGFpbkVuZDsgKythbmNlc3RvcikKKyAgICAgICAgICAgICAgICBp bmxpbmVCb3hGcmFnbWVudHNUb0Nsb3NlLmFwcGVuZCgqYW5jZXN0b3IpOworCisgICAgICAgICAg ICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZlcnNlZFJhbmdlKGlubGluZUJveEZyYWdt ZW50c1RvQ2xvc2UpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJbmxp bmVCb3goKSk7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveERpc3BsYXlCb3hNYXAu Y29udGFpbnMoaW5saW5lQm94KSk7CisgICAgICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0 LmFwcGVuZCh7IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KGlubGluZUJveCksIGluZGV4IH0p OworICAgICAgICAgICAgICAgIHBhcmVudEJveFN0YWNrLnJlbW92ZShpbmxpbmVCb3gpOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBJbnNlcnQgbmV3IGRpc3BsYXkgYm94ZXMgZm9y IGlubGluZSBib3ggZnJhZ21lbnRzIG9uIGJpZGkgYm91bmRhcnkuCisgICAgICAgICAgICBmb3Ig KGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZlcnNlZFJhbmdlKGlubGluZUJveE5lZWRpbmdEaXNw bGF5Qm94TGlzdCkpIHsKKyAgICAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGlu ZUJveCgpKTsKKyAgICAgICAgICAgICAgICBwYXJlbnRCb3hTdGFjay5hZGQoaW5saW5lQm94KTsK KworICAgICAgICAgICAgICAgIGF1dG8gY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGlu ZUJveEZyYWdtZW50ID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHRo YXQgdGhlICJwcmV2aW91cyIgZGlzcGxheSBib3ggZm9yIHRoaXMgcGFydGljdWxhciBpbmxpbmUg Ym94IGlzIG5vdCB0cmFja2VkIGFzIHRoZSAibGFzdCBib3giLgorICAgICAgICAgICAgICAgICAg ICBhdXRvIGxhc3REaXNwbGF5Qm94Rm9ySW5saW5lQm94SW5kZXggPSBpbmxpbmVCb3hEaXNwbGF5 Qm94TWFwLnRha2UoaW5saW5lQm94KTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBpc0ZpcnN0 RnJhZ21lbnQgPSAhbGFzdERpc3BsYXlCb3hGb3JJbmxpbmVCb3hJbmRleDsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKCFpc0ZpcnN0RnJhZ21lbnQpCisgICAgICAgICAgICAgICAgICAgICAgICBi b3hlc1tsYXN0RGlzcGxheUJveEZvcklubGluZUJveEluZGV4XS5zZXRJc0xhc3RCb3goZmFsc2Up OworICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hEaXNwbGF5Qm94TWFwLnNldChpbmxpbmVC b3gsIGluZGV4KTsKKworICAgICAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZv cm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCppbmxpbmVCb3gpOworICAgICAgICAgICAgICAg ICAgICBhdXRvIHZpc3VhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVC b3goKmlubGluZUJveCwgYm94R2VvbWV0cnkpOworICAgICAgICAgICAgICAgICAgICAvLyBVc2Ug dGhlIGN1cnJlbnQgY29udGVudCBsZWZ0IGFzIHRoZSBzdGFydGluZyBwb2ludCBmb3IgdGhpcyBk aXNwbGF5IGJveC4KKyAgICAgICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5zZXRMZWZ0KGJveGVz W2luZGV4XS5sb2dpY2FsTGVmdCgpKTsKKyAgICAgICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5t b3ZlVmVydGljYWxseShsaW5lQm94TG9naWNhbFRvcExlZnQueSgpKTsKKyAgICAgICAgICAgICAg ICAgICAgLy8gVmlzdWFsIHdpZHRoIGlzIG5vdCB5ZXQga25vd24uCisgICAgICAgICAgICAgICAg ICAgIHZpc3VhbFJlY3Quc2V0V2lkdGgoeyB9KTsKKyAgICAgICAgICAgICAgICAgICAgaW5zZXJ0 SW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShsaW5lQm94LmlubGluZUxldmVsQm94 Rm9yTGF5b3V0Qm94KCppbmxpbmVCb3gpLCB2aXN1YWxSZWN0LCBpc0ZpcnN0RnJhZ21lbnQsIGlu ZGV4LCBib3hlcyk7CisgICAgICAgICAgICAgICAgICAgICsraW5kZXg7CisgICAgICAgICAgICAg ICAgICAgIC8vIE5lZWQgdG8gcHVzaCB0aGUgcmVzdCBvZiB0aGUgY29udGVudCB3aGVuIHRoaXMg aW5saW5lIGJveCBoYXMgbWFyZ2luL2JvcmRlci9wYWRkaW5nLgorICAgICAgICAgICAgICAgICAg ICBuZWVkc0Rpc3BsYXlCb3hIb3Jpem9udGFsQWRqdXN0bWVudCA9IG5lZWRzRGlzcGxheUJveEhv cml6b250YWxBZGp1c3RtZW50CisgICAgICAgICAgICAgICAgICAgICAgICB8fCBib3hHZW9tZXRy eS5ob3Jpem9udGFsQm9yZGVyKCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21l dHJ5Lmhvcml6b250YWxQYWRkaW5nKCkudmFsdWVfb3IoMCkKKyAgICAgICAgICAgICAgICAgICAg ICAgIHx8IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkKKyAgICAgICAgICAgICAgICAgICAgICAg IHx8IGJveEdlb21ldHJ5Lm1hcmdpbkVuZCgpOworICAgICAgICAgICAgICAgIH07CisgICAgICAg ICAgICAgICAgY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGluZUJveEZyYWdtZW50KCk7 CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgLy8gIkNsb3NlIiB0aGUgcmVtYWlu aW5nIGlubGluZSBib3hlcyBvbiB0aGUgc3RhY2sgKGV4Y2x1ZGluZyB0aGUgcm9vdCkuCiAgICAg ICAgIHdoaWxlIChwYXJlbnRCb3hTdGFjay5zaXplKCkgPiAxKSB7Cg== 445975 2021-12-04 20:12:34 -0800 2021-12-04 20:12:34 -0800 Patch bug-233855-20211204201233.patch text/plain 10925 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlNTQxYmQ0MmRlNDY2 ODQyYjJhYjViMjEwN2YyZTc3YmFjMDJlNy4uZDJiYWRkYWY4MGVmMDE4MWEyNDgxOTgwOWVhNmZm MDI0ZGM0YWNhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIGNyZWF0ZURp c3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJbmxpbmVCb3hlcyBjb3VsZCB1c2UgbGVzcyBuZXN0 aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM4 NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3N0 bHkgbW92aW5nIGNvZGUgYXJvdW5kIGFuZCB1c2luZyBiZXR0ZXIgdmFyaWFibGUgbmFtZXMuCisK KyAgICAgICAgVGhpcyBpcyBhbHNvIGluIHByZXBhcmF0aW9uIGZvciBtYWtpbmcgdGhpcyBmdW5j dGlvbiBwYXJ0IG9mIHRoZSBpbml0aWFsIGxvb3AgaW4gY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1 YWxPcmRlckZvckNvbnRlbnRSdW5zLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNv bnRlbnQpOgorCiAyMDIxLTEyLTA0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIENvbXB1dGUgaXNGaXJzdEJveC9pc0xhc3RCb3ggZm9yIHRleHQg Y29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5jcHAKaW5kZXggNzk3YWMwMzE4MTg5ZTJkNTQxMmFjNmIwYTE2OTFlZmQyZGNlZmY5 Zi4uMDg3NmRjZmMwMGQ1ZDE5NzlmNTEzMDEwZTc0NzNjZGQ3NzgwZmI3YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC00 MjksODggKzQyOSw4NyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgICAgICAvLyB0byBh Y2NvbW1vZGF0ZSB0aGUgY3VycmVudCBjb250ZW50LgogICAgICAgICAvLyBXZSBkbyBpdCBieSBm aW5kaW5nIHRoZSBsb3dlc3QgY29tbW9uIGFuY2VzdG9yIG9mIHRoZSBsYXN0IGFuZCB0aGUgY3Vy cmVudCBjb250ZW50IGRpc3BsYXkgYm94ZXMgYW5kCiAgICAgICAgIC8vIHRyYXZlcnNlIGJvdGgg YW5jZXN0b3IgY2hhaW5zIGFuZCBjbG9zZS9vcGVuIHRoZSBwYXJlbnQgKGlubGluZSkgYm94ZXMu Ci0gICAgICAgIC8vIChvcGVuIGhlcmUgbWVhbnMgdG8gY3JlYXRlIGEgbmV3IGRpc3BsYXkgYm94 LCB3aGlsZSBjbG9zZSBtZWFucyB0byBzaW1wbHkgcG9wIGl0IG91dCBvZiBwYXJlbnRCb3hTdGFj aykuCisgICAgICAgIC8vIChvcGVuIGhlcmUgbWVhbnMgdG8gY3JlYXRlIGEgbmV3IGRpc3BsYXkg Ym94LCB3aGlsZSBjbG9zZSBtZWFucyB0byBzaW1wbHkgcG9wIGl0IG91dCBvZiBhbmNlc3RvcnMp LgogICAgICAgICAvLyA8ZGl2PmE8c3BhbiBpZD1maXJzdD5iJiM4MjM4O2c8L3NwYW4+ZjxzcGFu IGlkPXNlY29uZD5lJiM4MjM3O2M8L3NwYW4+ZDwvZGl2PgogICAgICAgICAvLyBwcm9kdWNlcyB0 aGUgZm9sbG93aW5nIG91dHB1dCAobm90ZSB0aGUgIzgyMzg7ICM4MjM3OyBSVEwvTFRSIGNvbnRy b2wgY2hhcmFjdGVycyk6CiAgICAgICAgIC8vIGFiY2RlZmcKICAgICAgICAgLy8gd2l0aCB0aGUg Zm9sbG93aW5nLCBmcmFnbWVudGVkIGlubGluZSBib3hlczoKICAgICAgICAgLy8gYVtmaXJzdCBv cGVuXWJbZmlyc3QgY2xvc2VdW3NlY29uZCBvcGVuXWNbc2Vjb25kIGNsb3NlXWRbc2Vjb25kIG9w ZW5dZVtzZWNvbmQgY2xvc2VdZltmaXJzdCBvcGVuXWdbZmlyc3QgY2xvc2VdCiAgICAgICAgIEhh c2hNYXA8Y29uc3QgQm94Kiwgc2l6ZV90PiBpbmxpbmVCb3hEaXNwbGF5Qm94TWFwOwotICAgICAg ICBMaXN0SGFzaFNldDxjb25zdCBCb3gqPiBwYXJlbnRCb3hTdGFjazsKLSAgICAgICAgcGFyZW50 Qm94U3RhY2suYWRkKCZyb290KCkpOworICAgICAgICBMaXN0SGFzaFNldDxjb25zdCBCb3gqPiBh bmNlc3RvcnM7CisgICAgICAgIGFuY2VzdG9ycy5hZGQoJnJvb3QoKSk7CiAKICAgICAgICAgQVNT RVJUKGJveGVzWzBdLmlzUm9vdElubGluZUJveCgpKTsKICAgICAgICAgZm9yIChzaXplX3QgaW5k ZXggPSAxOyBpbmRleCA8IGJveGVzLnNpemUoKTsgKytpbmRleCkgewogICAgICAgICAgICAgYXV0 byYgcGFyZW50Qm94ID0gYm94ZXNbaW5kZXhdLmxheW91dEJveCgpLnBhcmVudCgpOwogICAgICAg ICAgICAgQVNTRVJUKHBhcmVudEJveC5pc0lubGluZUJveCgpIHx8ICZwYXJlbnRCb3ggPT0gJnJv b3QoKSk7CiAKLSAgICAgICAgICAgIGF1dG8gcnVuUGFyZW50SXNDdXJyZW50SW5saW5lQm94ID0g JnBhcmVudEJveCA9PSBwYXJlbnRCb3hTdGFjay5sYXN0KCk7CisgICAgICAgICAgICBhdXRvIHJ1 blBhcmVudElzQ3VycmVudElubGluZUJveCA9ICZwYXJlbnRCb3ggPT0gYW5jZXN0b3JzLmxhc3Qo KTsKICAgICAgICAgICAgIGlmIChydW5QYXJlbnRJc0N1cnJlbnRJbmxpbmVCb3gpIHsKICAgICAg ICAgICAgICAgICAvLyBXZSd2ZSBnb3QgdGhlIGNvcnJlY3QgaW5saW5lIGJveCBhcyBwYXJlbnQu IE5vdGhpbmcgdG8gZG8gaGVyZS4KICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGF1dG8gcGFyZW50Qm94U3RhY2tFbmQgPSBwYXJlbnRCb3hTdGFj ay5lbmQoKTsKKwogICAgICAgICAgICAgVmVjdG9yPGNvbnN0IEJveCo+IGlubGluZUJveE5lZWRp bmdEaXNwbGF5Qm94TGlzdDsKKyAgICAgICAgICAgIGF1dG8gYW5jZXN0b3JDaGFpbkVuZCA9IGFu Y2VzdG9ycy5lbmQoKTsKKyAgICAgICAgICAgIGF1dG8gbG93ZXN0Q29tbW9uQW5jZXN0b3IgPSBh bmNlc3RvckNoYWluRW5kOwogICAgICAgICAgICAgZm9yIChhdXRvKiBhbmNlc3RvciA9ICZwYXJl bnRCb3g7IGFuY2VzdG9yOyBhbmNlc3RvciA9ICZhbmNlc3Rvci0+cGFyZW50KCkpIHsKLSAgICAg ICAgICAgICAgICBBU1NFUlQoYW5jZXN0b3IgPT0gJnJvb3QoKSB8fCBhbmNlc3Rvci0+aXNJbmxp bmVCb3goKSk7Ci0gICAgICAgICAgICAgICAgYXV0byBwYXJlbnRCb3hJdGVyYXRvciA9IHBhcmVu dEJveFN0YWNrLmZpbmQoYW5jZXN0b3IpOwotICAgICAgICAgICAgICAgIGlmIChwYXJlbnRCb3hJ dGVyYXRvciAhPSBwYXJlbnRCb3hTdGFja0VuZCkgewotICAgICAgICAgICAgICAgICAgICAvLyBU aGlzIGlzIHRoZSBsb3dlc3QgY29tbW9uIGFuY2VzdG9yLgotICAgICAgICAgICAgICAgICAgICAv LyBMZXQncyB0cmF2ZXJzZSBib3RoIGFuY2VzdG9yIGNoYWlucyBhbmQgY3JlYXRlL2Nsb3NlIGRp c3BsYXkgYm94ZXMgYXMgbmVlZGVkLgotICAgICAgICAgICAgICAgICAgICBWZWN0b3I8Y29uc3Qg Qm94Kj4gaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZTsKLSAgICAgICAgICAgICAgICAgICAgZm9y IChhdXRvIGl0ID0gKytwYXJlbnRCb3hJdGVyYXRvcjsgaXQgIT0gcGFyZW50Qm94U3RhY2tFbmQ7 ICsraXQpCi0gICAgICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hGcmFnbWVudHNUb0Nsb3Nl LmFwcGVuZCgqaXQpOwotCi0gICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byogaW5saW5lQm94 IDogbWFrZVJldmVyc2VkUmFuZ2UoaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZSkpIHsKLSAgICAg ICAgICAgICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOwotICAg ICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveERpc3BsYXlCb3hNYXAuY29udGFp bnMoaW5saW5lQm94KSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hSYW5nZUxp c3QuYXBwZW5kKHsgaW5saW5lQm94RGlzcGxheUJveE1hcC5nZXQoaW5saW5lQm94KSwgaW5kZXgg fSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwYXJlbnRCb3hTdGFjay5yZW1vdmUoaW5saW5l Qm94KTsKLSAgICAgICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgICAgIC8vIElu c2VydCBuZXcgZGlzcGxheSBib3hlcyBmb3IgaW5saW5lIGJveCBmcmFnbWVudHMgb24gYmlkaSBi b3VuZGFyeS4KLSAgICAgICAgICAgICAgICAgICAgZm9yIChhdXRvKiBpbmxpbmVCb3ggOiBtYWtl UmV2ZXJzZWRSYW5nZShpbmxpbmVCb3hOZWVkaW5nRGlzcGxheUJveExpc3QpKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIHBhcmVudEJveFN0YWNrLmFkZChpbmxpbmVCb3gpOwotCi0gICAg ICAgICAgICAgICAgICAgICAgICBhdXRvIGNyZWF0ZUFuZEluc2VydERpc3BsYXlCb3hGb3JJbmxp bmVCb3hGcmFnbWVudCA9IFsmXSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gTWFr ZSBzdXJlIHRoYXQgdGhlICJwcmV2aW91cyIgZGlzcGxheSBib3ggZm9yIHRoaXMgcGFydGljdWxh ciBpbmxpbmUgYm94IGlzIG5vdCB0cmFja2VkIGFzIHRoZSAibGFzdCBib3giLgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGF1dG8gbGFzdERpc3BsYXlCb3hGb3JJbmxpbmVCb3hJbmRleCA9 IGlubGluZUJveERpc3BsYXlCb3hNYXAudGFrZShpbmxpbmVCb3gpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8gaXNGaXJzdEZyYWdtZW50ID0gIWxhc3REaXNwbGF5Qm94Rm9ySW5s aW5lQm94SW5kZXg7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFpc0ZpcnN0RnJh Z21lbnQpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJveGVzW2xhc3REaXNwbGF5 Qm94Rm9ySW5saW5lQm94SW5kZXhdLnNldElzTGFzdEJveChmYWxzZSk7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW5saW5lQm94RGlzcGxheUJveE1hcC5zZXQoaW5saW5lQm94LCBpbmRl eCk7Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZv cm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCppbmxpbmVCb3gpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZv cklubGluZUJveCgqaW5saW5lQm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gVXNlIHRoZSBjdXJyZW50IGNvbnRlbnQgbGVmdCBhcyB0aGUgc3RhcnRpbmcg cG9pbnQgZm9yIHRoaXMgZGlzcGxheSBib3guCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg dmlzdWFsUmVjdC5zZXRMZWZ0KGJveGVzW2luZGV4XS5sb2dpY2FsTGVmdCgpKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KGxpbmVCb3hMb2dp Y2FsVG9wTGVmdC55KCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFZpc3VhbCB3 aWR0aCBpcyBub3QgeWV0IGtub3duLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc3Vh bFJlY3Quc2V0V2lkdGgoeyB9KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnNlcnRJ bmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KGxpbmVCb3guaW5saW5lTGV2ZWxCb3hG b3JMYXlvdXRCb3goKmlubGluZUJveCksIHZpc3VhbFJlY3QsIGlzRmlyc3RGcmFnbWVudCwgaW5k ZXgsIGJveGVzKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICArK2luZGV4OwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIE5lZWQgdG8gcHVzaCB0aGUgcmVzdCBvZiB0aGUgY29u dGVudCB3aGVuIHRoaXMgaW5saW5lIGJveCBoYXMgbWFyZ2luL2JvcmRlci9wYWRkaW5nLgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRzRGlzcGxheUJveEhvcml6b250YWxBZGp1c3Rt ZW50ID0gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFkanVzdG1lbnQKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfHwgYm94R2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRk aW5nKCkudmFsdWVfb3IoMCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94 R2VvbWV0cnkubWFyZ2luU3RhcnQoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 fCBib3hHZW9tZXRyeS5tYXJnaW5FbmQoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH07Ci0g ICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5l Qm94RnJhZ21lbnQoKTsKLSAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGxv d2VzdENvbW1vbkFuY2VzdG9yID0gYW5jZXN0b3JzLmZpbmQoYW5jZXN0b3IpOworICAgICAgICAg ICAgICAgIGlmIChsb3dlc3RDb21tb25BbmNlc3RvciAhPSBhbmNlc3RvckNoYWluRW5kKQogICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgLy8gcm9vdCBtYXkgbm90IGJlIHRoZSBsb3dlc3QgYnV0IGFsd2F5cyBhIGNvbW1vbiBhbmNl c3Rvci4KLSAgICAgICAgICAgICAgICBBU1NFUlQoYW5jZXN0b3IgIT0gJnJvb3QoKSk7CiAgICAg ICAgICAgICAgICAgaW5saW5lQm94TmVlZGluZ0Rpc3BsYXlCb3hMaXN0LmFwcGVuZChhbmNlc3Rv cik7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICAvLyBUaGVyZSdzIGFsd2F5cyBhIGNvbW1v biBhbmNlc3RvciwgZWl0aGVyIGFuIGlubGluZSBib3ggb3IgdGhlIGZvcm1hdHRpbmcgY29udGV4 dCByb290LgorICAgICAgICAgICAgQVNTRVJUKGxvd2VzdENvbW1vbkFuY2VzdG9yICE9IGFuY2Vz dG9yQ2hhaW5FbmQpOworICAgICAgICAgICAgLy8gTGV0J3MgdHJhdmVyc2UgYm90aCBhbmNlc3Rv ciBjaGFpbnMgYW5kIGNyZWF0ZS9jbG9zZSBkaXNwbGF5IGJveGVzIGFzIG5lZWRlZC4KKyAgICAg ICAgICAgIFZlY3Rvcjxjb25zdCBCb3gqPiBpbmxpbmVCb3hGcmFnbWVudHNUb0Nsb3NlOworICAg ICAgICAgICAgZm9yIChhdXRvIGFuY2VzdG9yID0gKytsb3dlc3RDb21tb25BbmNlc3RvcjsgYW5j ZXN0b3IgIT0gYW5jZXN0b3JDaGFpbkVuZDsgKythbmNlc3RvcikKKyAgICAgICAgICAgICAgICBp bmxpbmVCb3hGcmFnbWVudHNUb0Nsb3NlLmFwcGVuZCgqYW5jZXN0b3IpOworCisgICAgICAgICAg ICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZlcnNlZFJhbmdlKGlubGluZUJveEZyYWdt ZW50c1RvQ2xvc2UpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJbmxp bmVCb3goKSk7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveERpc3BsYXlCb3hNYXAu Y29udGFpbnMoaW5saW5lQm94KSk7CisgICAgICAgICAgICAgICAgaW5saW5lQm94UmFuZ2VMaXN0 LmFwcGVuZCh7IGlubGluZUJveERpc3BsYXlCb3hNYXAuZ2V0KGlubGluZUJveCksIGluZGV4IH0p OworICAgICAgICAgICAgICAgIGFuY2VzdG9ycy5yZW1vdmUoaW5saW5lQm94KTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgLy8gSW5zZXJ0IG5ldyBkaXNwbGF5IGJveGVzIGZvciBpbmxp bmUgYm94IGZyYWdtZW50cyBvbiBiaWRpIGJvdW5kYXJ5LgorICAgICAgICAgICAgZm9yIChhdXRv KiBpbmxpbmVCb3ggOiBtYWtlUmV2ZXJzZWRSYW5nZShpbmxpbmVCb3hOZWVkaW5nRGlzcGxheUJv eExpc3QpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGlubGluZUJveC0+aXNJbmxpbmVCb3go KSk7CisgICAgICAgICAgICAgICAgYW5jZXN0b3JzLmFkZChpbmxpbmVCb3gpOworCisgICAgICAg ICAgICAgICAgYXV0byBjcmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5lQm94RnJhZ21l bnQgPSBbJl0geworICAgICAgICAgICAgICAgICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgInBy ZXZpb3VzIiBkaXNwbGF5IGJveCBmb3IgdGhpcyBwYXJ0aWN1bGFyIGlubGluZSBib3ggaXMgbm90 IHRyYWNrZWQgYXMgdGhlICJsYXN0IGJveCIuCisgICAgICAgICAgICAgICAgICAgIGF1dG8gbGFz dERpc3BsYXlCb3hGb3JJbmxpbmVCb3hJbmRleCA9IGlubGluZUJveERpc3BsYXlCb3hNYXAudGFr ZShpbmxpbmVCb3gpOworICAgICAgICAgICAgICAgICAgICBhdXRvIGlzRmlyc3RGcmFnbWVudCA9 ICFsYXN0RGlzcGxheUJveEZvcklubGluZUJveEluZGV4OworICAgICAgICAgICAgICAgICAgICBp ZiAoIWlzRmlyc3RGcmFnbWVudCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJveGVzW2xhc3RE aXNwbGF5Qm94Rm9ySW5saW5lQm94SW5kZXhdLnNldElzTGFzdEJveChmYWxzZSk7CisgICAgICAg ICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3hNYXAuc2V0KGlubGluZUJveCwgaW5kZXgp OworCisgICAgICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0 YXRlKCkuYm94R2VvbWV0cnkoKmlubGluZUJveCk7CisgICAgICAgICAgICAgICAgICAgIGF1dG8g dmlzdWFsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJveCgqaW5saW5l Qm94LCBib3hHZW9tZXRyeSk7CisgICAgICAgICAgICAgICAgICAgIC8vIFVzZSB0aGUgY3VycmVu dCBjb250ZW50IGxlZnQgYXMgdGhlIHN0YXJ0aW5nIHBvaW50IGZvciB0aGlzIGRpc3BsYXkgYm94 LgorICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0LnNldExlZnQoYm94ZXNbaW5kZXhdLmxv Z2ljYWxMZWZ0KCkpOworICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0Lm1vdmVWZXJ0aWNh bGx5KGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCkpOworICAgICAgICAgICAgICAgICAgICAvLyBW aXN1YWwgd2lkdGggaXMgbm90IHlldCBrbm93bi4KKyAgICAgICAgICAgICAgICAgICAgdmlzdWFs UmVjdC5zZXRXaWR0aCh7IH0pOworICAgICAgICAgICAgICAgICAgICBpbnNlcnRJbmxpbmVCb3hE aXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRC b3goKmlubGluZUJveCksIHZpc3VhbFJlY3QsIGlzRmlyc3RGcmFnbWVudCwgaW5kZXgsIGJveGVz KTsKKyAgICAgICAgICAgICAgICAgICAgKytpbmRleDsKKyAgICAgICAgICAgICAgICAgICAgLy8g TmVlZCB0byBwdXNoIHRoZSByZXN0IG9mIHRoZSBjb250ZW50IHdoZW4gdGhpcyBpbmxpbmUgYm94 IGhhcyBtYXJnaW4vYm9yZGVyL3BhZGRpbmcuCisgICAgICAgICAgICAgICAgICAgIG5lZWRzRGlz cGxheUJveEhvcml6b250YWxBZGp1c3RtZW50ID0gbmVlZHNEaXNwbGF5Qm94SG9yaXpvbnRhbEFk anVzdG1lbnQKKyAgICAgICAgICAgICAgICAgICAgICAgIHx8IGJveEdlb21ldHJ5Lmhvcml6b250 YWxCb3JkZXIoKQorICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94R2VvbWV0cnkuaG9yaXpv bnRhbFBhZGRpbmcoKS52YWx1ZV9vcigwKQorICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94 R2VvbWV0cnkubWFyZ2luU3RhcnQoKQorICAgICAgICAgICAgICAgICAgICAgICAgfHwgYm94R2Vv bWV0cnkubWFyZ2luRW5kKCk7CisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICBj cmVhdGVBbmRJbnNlcnREaXNwbGF5Qm94Rm9ySW5saW5lQm94RnJhZ21lbnQoKTsKKyAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgICAgICAvLyAiQ2xvc2UiIHRoZSByZW1haW5pbmcgaW5saW5l IGJveGVzIG9uIHRoZSBzdGFjayAoZXhjbHVkaW5nIHRoZSByb290KS4KLSAgICAgICAgd2hpbGUg KHBhcmVudEJveFN0YWNrLnNpemUoKSA+IDEpIHsKLSAgICAgICAgICAgIGF1dG8qIHBhcmVudElu bGluZUJveCA9IHBhcmVudEJveFN0YWNrLnRha2VMYXN0KCk7Ci0gICAgICAgICAgICBBU1NFUlQo aW5saW5lQm94RGlzcGxheUJveE1hcC5jb250YWlucyhwYXJlbnRJbmxpbmVCb3gpKTsKLSAgICAg ICAgICAgIGlubGluZUJveFJhbmdlTGlzdC5hcHBlbmQoeyBpbmxpbmVCb3hEaXNwbGF5Qm94TWFw LmdldChwYXJlbnRJbmxpbmVCb3gpLCBib3hlcy5zaXplKCkgfSk7CisgICAgICAgIHdoaWxlIChh bmNlc3RvcnMuc2l6ZSgpID4gMSkgeworICAgICAgICAgICAgYXV0byogYW5jZXN0b3JJbmxpbmVC b3ggPSBhbmNlc3RvcnMudGFrZUxhc3QoKTsKKyAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3hE aXNwbGF5Qm94TWFwLmNvbnRhaW5zKGFuY2VzdG9ySW5saW5lQm94KSk7CisgICAgICAgICAgICBp bmxpbmVCb3hSYW5nZUxpc3QuYXBwZW5kKHsgaW5saW5lQm94RGlzcGxheUJveE1hcC5nZXQoYW5j ZXN0b3JJbmxpbmVCb3gpLCBib3hlcy5zaXplKCkgfSk7CiAgICAgICAgIH0KICAgICB9OwogICAg IGlmIChuZWVkc05vblJvb3RJbmxpbmVCb3hEaXNwbGF5Qm94KQo=