236042 2022-02-02 14:50:28 -0800 [RenderTreeBuilder] Clean up column spanners when style change affects containing block 2022-02-05 08:38:49 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236154 1 zalan zalan bfulgham changseok commit-queue esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser zalan oldest_to_newest 1836645 0 zalan 2022-02-02 14:50:28 -0800 <rdar://83975391> 1836646 1 450699 zalan 2022-02-02 14:57:05 -0800 Created attachment 450699 Patch 1837155 2 450833 zalan 2022-02-03 15:53:24 -0800 Created attachment 450833 Patch 1837204 3 ews-feeder 2022-02-03 18:25:33 -0800 Committed r289098 (246795@main): <https://commits.webkit.org/246795@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450833. 1837570 4 commit-queue 2022-02-04 13:27:08 -0800 Re-opened since this is blocked by bug 236154 1837586 5 450938 zalan 2022-02-04 14:17:42 -0800 Created attachment 450938 Patch 1837752 6 ews-feeder 2022-02-05 08:38:46 -0800 Committed r289157 (246853@main): <https://commits.webkit.org/246853@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450938. 450699 2022-02-02 14:57:05 -0800 2022-02-03 15:53:22 -0800 Patch bug-236042-20220202145704.patch text/plain 8795 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVkYTA4MDZjZGJiOTEw ZTMzYmVmNWEzNDE1ODExMjMwNzkwZTcwMC4uYTEzNWEzNzE1NjcyMTBmNzY3ZDVjYjFiYjc5OTU1 NTk5MjI4Njk3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd IENsZWFuIHVwIGNvbHVtbiBzcGFubmVycyB3aGVuIHN0eWxlIGNoYW5nZSBhZmZlY3RzIGNvbnRh aW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNjA0MgorICAgICAgICA8cmRhcjovLzgzOTc1MzkxPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRo ZSBsZWZ0b3ZlciBzcGFubmVycyBhZnRlciBzdHlsZSBjaGFuZ2UsIHRoaXMgcGF0Y2ggYWxzbyBl eHBhbmRzIG9uIHRoZSB0eXBlIG9mIHN0eWxlIGNoYW5nZXMgdGhhdCBtYXkgYWZmZWN0IHRoZSBz dWJ0cmVlIHN0YXRlIGluc2lkZSBhIG11bHRpY29sdW1uIGZsb3cuCisKKyAgICAgICAgVGVzdDog ZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpzZXRTdHls ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjphZGp1c3RGcmFnbWVudGVkRmxv d1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Om5v cm1hbGl6ZVRyZWVBZnRlclN0eWxlQ2hhbmdlKToKKwogMjAyMi0wMi0wMiAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgTGliV2ViUlRDQ29kZWNzIHNob3VsZCBu b3QgbmVlZCB0byBjcmVhdGUgSU9TdXJmYWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKaW5kZXggZmEyMTgzYzY0ZTVjOGFkNjQ3YjBmYjc0ZGVjYzFiMWIxZjBjODNj OC4uZGZkMzMzNzlhMWI3ZDRiMmVlOTA4ZjQ1OWNhODYxYjcwZmRjNjQwMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC00MzIsMTIgKzQzMiw4IEBAIHN0YXRp YyBib29sIGJvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQoY29uc3QgUmVuZGVyU3R5 bGUmIG9sZFN0eWxlLCBjb25zCiAKIHZvaWQgUmVuZGVyQmxvY2s6OnN0eWxlRGlkQ2hhbmdlKFN0 eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpCiB7Ci0gICAg Ym9vbCBoYWRUcmFuc2Zvcm0gPSBoYXNUcmFuc2Zvcm0oKTsKICAgICBSZW5kZXJCb3g6OnN0eWxl RGlkQ2hhbmdlKGRpZmYsIG9sZFN0eWxlKTsKIAotICAgIGlmIChoYWRUcmFuc2Zvcm0gIT0gaGFz VHJhbnNmb3JtKCkpCi0gICAgICAgIGFkanVzdEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5p bmdCbG9ja0NoYW5nZUlmTmVlZGVkKCk7Ci0KICAgICBwcm9wYWdhdGVTdHlsZVRvQW5vbnltb3Vz Q2hpbGRyZW4oUHJvcGFnYXRlVG9CbG9ja0NoaWxkcmVuT25seSk7CiAKICAgICAvLyBJdCdzIHBv c3NpYmxlIGZvciBvdXIgYm9yZGVyL3BhZGRpbmcgdG8gY2hhbmdlLCBidXQgZm9yIHRoZSBvdmVy YWxsIGxvZ2ljYWwgd2lkdGggb2YgdGhlIGJsb2NrIHRvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggYjdjNGVkOGU0NTYwYjRlYjVjZTJkNzE2Nzk4YmZi N2ZjODBhOWNiMy4uMTU4NzdhMTQ0NTMzOTM0Mjc3OTA4ODdhNmMxZWFkMmZiZDdhMzZjOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtNTMyLDEwICs1 MzIsNyBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnNldFN0eWxlKFJlbmRlclN0eWxlJiYgc3R5bGUs IFN0eWxlRGlmZmVyZW5jZSBtaW5pbWFsU3R5bGVEaQogICAgIGF1dG8gb2xkU3R5bGUgPSBtX3N0 eWxlLnJlcGxhY2UoV1RGTW92ZShzdHlsZSkpOwogICAgIGJvb2wgZGV0YWNoZWRGcm9tUGFyZW50 ID0gIXBhcmVudCgpOwogCi0gICAgLy8gTWFrZSBzdXJlIHdlIGludmFsaWRhdGUgdGhlIGNvbnRh aW5pbmcgYmxvY2sgY2FjaGUgZm9yIGZsb3dzIHdoZW4gdGhlIGNvbnRpYW5pbmcgYmxvY2sgY29u dGV4dCBjaGFuZ2VzCi0gICAgLy8gc28gdGhhdCBzdHlsZURpZENoYW5nZSBjYW4gc2FmZWx5IHVz ZSBSZW5kZXJCbG9jazo6bG9jYXRlRW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKQotICAgIGlmIChv bGRTdHlsZS5wb3NpdGlvbigpICE9IG1fc3R5bGUucG9zaXRpb24oKSkKLSAgICAgICAgYWRqdXN0 RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQoKTsKKyAg ICBhZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRl ZChvbGRTdHlsZSwgbV9zdHlsZSk7CiAKICAgICBzdHlsZURpZENoYW5nZShkaWZmLCAmb2xkU3R5 bGUpOwogCkBAIC0yMjE0LDExICsyMjExLDIyIEBAIEltYWdlT3JpZW50YXRpb24gUmVuZGVyRWxl bWVudDo6aW1hZ2VPcmllbnRhdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIChpbWFnZUVsZW1lbnQg JiYgIWltYWdlRWxlbWVudC0+YWxsb3dzT3JpZW50YXRpb25PdmVycmlkZSgpKSA/IEltYWdlT3Jp ZW50YXRpb24oSW1hZ2VPcmllbnRhdGlvbjo6RnJvbUltYWdlKSA6IHN0eWxlKCkuaW1hZ2VPcmll bnRhdGlvbigpOwogfQogCi12b2lkIFJlbmRlckVsZW1lbnQ6OmFkanVzdEZyYWdtZW50ZWRGbG93 U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKCkKK3ZvaWQgUmVuZGVyRWxlbWVu dDo6YWRqdXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVk ZWQoY29uc3QgUmVuZGVyU3R5bGUmIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3U3R5 bGUpCiB7CiAgICAgaWYgKGZyYWdtZW50ZWRGbG93U3RhdGUoKSA9PSBOb3RJbnNpZGVGcmFnbWVu dGVkRmxvdykKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gTWFrZSBzdXJlIHdlIGludmFsaWRh dGUgdGhlIGNvbnRhaW5pbmcgYmxvY2sgY2FjaGUgZm9yIGZsb3dzIHdoZW4gdGhlIGNvbnRpYW5p bmcgYmxvY2sgY29udGV4dCBjaGFuZ2VzCisgICAgLy8gc28gdGhhdCBzdHlsZURpZENoYW5nZSBj YW4gc2FmZWx5IHVzZSBSZW5kZXJCbG9jazo6bG9jYXRlRW5jbG9zaW5nRnJhZ21lbnRlZEZsb3co KQorICAgIC8vIEZJWE1FOiBTaGFyZSBzb21lIGNvZGUgd2l0aCBSZW5kZXJFbGVtZW50OjpjYW5D b250YWluKi4KKyAgICBhdXRvIG1heU5vdEJlQ29udGFpbmluZ0Jsb2NrRm9yRGVzY2VuZGFudHNB bnltb3JlID0gb2xkU3R5bGUucG9zaXRpb24oKSAhPSBtX3N0eWxlLnBvc2l0aW9uKCkKKyAgICAg ICAgfHwgb2xkU3R5bGUuaGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkgIT0gbV9zdHlsZS5o YXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKQorICAgICAgICB8fCBvbGRTdHlsZS53aWxsQ2hh bmdlKCkgIT0gbmV3U3R5bGUud2lsbENoYW5nZSgpCisgICAgICAgIHx8IG9sZFN0eWxlLmNvbnRh aW5zTGF5b3V0KCkgIT0gbmV3U3R5bGUuY29udGFpbnNMYXlvdXQoKQorICAgICAgICB8fCBvbGRT dHlsZS5jb250YWluc1NpemUoKSAhPSBuZXdTdHlsZS5jb250YWluc1NpemUoKTsKKyAgICBpZiAo IW1heU5vdEJlQ29udGFpbmluZ0Jsb2NrRm9yRGVzY2VuZGFudHNBbnltb3JlKQorICAgICAgICBy ZXR1cm47CisKICAgICAvLyBJbnZhbGlkYXRlIHRoZSBjb250YWluaW5nIGJsb2NrIGNhY2hlcy4K ICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KCp0aGlzKSkKICAgICAgICAgZG93bmNhc3Q8UmVuZGVy QmxvY2s+KCp0aGlzKS5yZXNldEVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93QW5kQ2hpbGRJbmZvSW5j bHVkaW5nRGVzY2VuZGFudHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5oCmluZGV4IDU1YWRkMTk0NzY2ZTAyNWJhMjc3NjRhYTRjNDE1MTZiOGU5MDAwMWYuLmYzNzZj ZWNiOTc1Y2E3MTlmZGY2NzZlNWFjMGZiOTVkOGUyZWQyMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMzI2LDcgKzMyNiw3IEBAIHByb3RlY3RlZDoKICAg ICB2b2lkIHVwZGF0ZU91dGxpbmVBdXRvQW5jZXN0b3IoYm9vbCBoYXNPdXRsaW5lQXV0byk7CiAK ICAgICB2b2lkIHJlbW92ZUZyb21SZW5kZXJGcmFnbWVudGVkRmxvd0luY2x1ZGluZ0Rlc2NlbmRh bnRzKGJvb2wgc2hvdWxkVXBkYXRlU3RhdGUpOwotICAgIHZvaWQgYWRqdXN0RnJhZ21lbnRlZEZs b3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQoKTsKKyAgICB2b2lkIGFkanVz dEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKGNvbnN0 IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlKTsKIAog ICAgIGJvb2wgaXNWaXNpYmxlSW5WaWV3cG9ydCgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRl eCA2OGM2Mjc5ODMyMDI4NzJmNGNkZjlhZWYzOTA4ODBmYjVlMGUzNjMxLi4wN2RkMjc3ZjJkNzQy NzczMDVlOWMwM2M5YWFkNWU0NWEyOWRjNGU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTY3MSw2ICs2 NzEsMTMgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6bm9ybWFsaXplVHJlZUFmdGVyU3R5bGVD aGFuZ2UoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIFIKICAgICAgICAgICAgIG11bHRpQ29sdW1u QnVpbGRlcigpLnJlc3RvcmVDb2x1bW5TcGFubmVyc0ZvckNvbnRhaW5lcihyZW5kZXJlciwgZG93 bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93PigqZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQorCisgICAgICAgIC8vIFN0eWxlIGNoYW5n ZSBtYXkgaGF2ZSBtb3ZlZCBzb21lIHN1YnRyZWUgb3V0IG9mIHRoZSBmcmFnbWVudGVkIGZsb3cu IFRoZWlyIGZsb3cgc3RhdGVzIGhhdmUgYWxyZWFkeSBiZWVuIHVwZGF0ZWQgKHNlZSBhZGp1c3RG cmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCkKKyAgICAg ICAgLy8gYW5kIGhlcmUgaXMgd2hlcmUgd2UgdGFrZSBjYXJlIG9mIHRoZSByZW1haW5pbmcsIHNw YW5uZXIgdHJlZSBtdXRhdGlvbi4KKyAgICAgICAgZm9yIChhdXRvJiBkZXNjZW5kYW50IDogZGVz Y2VuZGFudHNPZlR5cGU8UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXI+KHJlbmRl cmVyKSkgeworICAgICAgICAgICAgaWYgKGF1dG8qIGNvbnRhaW5pbmdCbG9jayA9IGRlc2NlbmRh bnQuY29udGFpbmluZ0Jsb2NrKCk7IGNvbnRhaW5pbmdCbG9jayAmJiBjb250YWluaW5nQmxvY2st PmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KCkgIT0gZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpCisg ICAgICAgICAgICAgICAgbXVsdGlDb2x1bW5CdWlsZGVyKCkucmVzdG9yZUNvbHVtblNwYW5uZXJz Rm9yQ29udGFpbmVyKCpjb250YWluaW5nQmxvY2ssIGRvd25jYXN0PFJlbmRlck11bHRpQ29sdW1u Rmxvdz4oKmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSk7CisgICAgICAgIH0KICAgICB9CiB9CiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0OTc1MTQyMjEzNWJiN2JjMzk0MzllM2YxYTI3MzFiNjM0Mzk5NjkwLi4xZDJmNzQw YWU1ZjdmNDQ4YjY2YTBiMDc0ZjZiZDY4MmE1N2U5Mzk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjItMDItMDIgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtS ZW5kZXJUcmVlQnVpbGRlcl0gQ2xlYW4gdXAgY29sdW1uIHNwYW5uZXJzIHdoZW4gc3R5bGUgY2hh bmdlIGFmZmVjdHMgY29udGFpbmluZyBibG9jaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MDQyCisgICAgICAgIDxyZGFyOi8vODM5NzUzOTE+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L211 bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNoLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0 eWxlLWNoYW5nZS1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMi0wMiAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZVdvcmtlck5hdmlnYXRpb25Q cmVsb2FkZXIgc2hvdWxkIG9ubHkgYmUgdXNlZCBvbmNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNoLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1v bi1zdHlsZS1jaGFuZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhiMTM3ODkxNzkx ZmU5NjkyN2FkNzhlNjRiMGFhZDdiZGVkMDhiZGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNo LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFu Z2UtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41NzZjYzUxNjk1NmY3MzlkM2U2Mzg1NDFjMmRiNjky OTZkNDA2ODAzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9s ZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMzEg QEAKKzxzdHlsZT4KKyAgaHRtbCB7CisgICAgY29sdW1uczogMXB4OworICB9CisgIGRpdjo6YmVm b3JlIHsKKyAgICBjb250ZW50OiB1cmwoKTsKKyAgfQorICBmcmFtZSB7CisgICAgY29sdW1uLXNw YW46IGFsbDsKKyAgfQorICA6Zmlyc3QtY2hpbGQgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK KyAgICByb3RhdGU6IDBkZWc7CisgIH0KKyAgOnJlYWQtb25seSB7CisgICAgdHJhbnNsYXRlOiAw OworICB9Cis8L3N0eWxlPgorPCEtLSBQQVNTIGlmIG5vIGNyYXNoIG9yIGFzc2VydC4gLS0+Cis8 c2NyaXB0PgorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7CisgIGludGVybmFscy5zZXR0aW5ncy5zZXRUZXh0QXV0b3NpemluZ0VuYWJsZWQodHJ1 ZSk7CisgIG9ubG9hZCA9ICgpID0+IHsKKyAgICBsZXQgZGl2MCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoJ2RpdicpOworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZGl2MCk7CisgICAg ZGl2MC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdmcmFtZScpKTsKKyAgICBk b2N1bWVudC5ib2R5Lm9mZnNldFRvcDsKKyAgICBkb2N1bWVudC5kZXNpZ25Nb2RlID0gJ29uJzsK KyAgfTsKKzwvc2NyaXB0Pgo= 450833 2022-02-03 15:53:24 -0800 2022-02-04 14:17:39 -0800 Patch bug-236042-20220203155323.patch text/plain 8796 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVkYTA4MDZjZGJiOTEw ZTMzYmVmNWEzNDE1ODExMjMwNzkwZTcwMC4uMWQ5NzU3NzBkMWU3MjI0NDVlOTQxYmIwYTk2MTlm NmMzMzI4MzMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTAzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd IENsZWFuIHVwIGNvbHVtbiBzcGFubmVycyB3aGVuIHN0eWxlIGNoYW5nZSBhZmZlY3RzIGNvbnRh aW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNjA0MgorICAgICAgICA8cmRhcjovLzgzOTc1MzkxPgorCisgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRo ZSBsZWZ0b3ZlciBzcGFubmVycyBhZnRlciBzdHlsZSBjaGFuZ2UsIHRoaXMgcGF0Y2ggYWxzbyBl eHBhbmRzIG9uIHRoZSB0eXBlIG9mIHN0eWxlIGNoYW5nZXMgdGhhdCBtYXkgYWZmZWN0IHRoZSBz dWJ0cmVlIHN0YXRlIGluc2lkZSBhIG11bHRpY29sdW1uIGZsb3cuCisKKyAgICAgICAgVGVzdDog ZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpzZXRTdHls ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjphZGp1c3RGcmFnbWVudGVkRmxv d1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Om5v cm1hbGl6ZVRyZWVBZnRlclN0eWxlQ2hhbmdlKToKKwogMjAyMi0wMi0wMiAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgTGliV2ViUlRDQ29kZWNzIHNob3VsZCBu b3QgbmVlZCB0byBjcmVhdGUgSU9TdXJmYWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKaW5kZXggZmEyMTgzYzY0ZTVjOGFkNjQ3YjBmYjc0ZGVjYzFiMWIxZjBjODNj OC4uMzJiNDYzY2EwNWU5ODdkMjZkMzdmMGNkZjZiNjY0NzNmNzYzOTg2YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC00MzIsMTEgKzQzMiwxMCBAQCBzdGF0 aWMgYm9vbCBib3JkZXJPclBhZGRpbmdMb2dpY2FsV2lkdGhDaGFuZ2VkKGNvbnN0IFJlbmRlclN0 eWxlJiBvbGRTdHlsZSwgY29ucwogCiB2b2lkIFJlbmRlckJsb2NrOjpzdHlsZURpZENoYW5nZShT dHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKQogewotICAg IGJvb2wgaGFkVHJhbnNmb3JtID0gaGFzVHJhbnNmb3JtKCk7CiAgICAgUmVuZGVyQm94OjpzdHls ZURpZENoYW5nZShkaWZmLCBvbGRTdHlsZSk7CiAKLSAgICBpZiAoaGFkVHJhbnNmb3JtICE9IGhh c1RyYW5zZm9ybSgpKQotICAgICAgICBhZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWlu aW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCgpOworICAgIGlmIChvbGRTdHlsZSkKKyAgICAgICAgYWRq dXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQoKm9s ZFN0eWxlLCBzdHlsZSgpKTsKIAogICAgIHByb3BhZ2F0ZVN0eWxlVG9Bbm9ueW1vdXNDaGlsZHJl bihQcm9wYWdhdGVUb0Jsb2NrQ2hpbGRyZW5Pbmx5KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IGI3YzRlZDhlNDU2MGI0ZWI1Y2UyZDcxNjc5OGJm YjdmYzgwYTljYjMuLjE1ODc3YTE0NDUzMzkzNDI3NzkwODg3YTZjMWVhZDJmYmQ3YTM2YzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTUzMiwxMCAr NTMyLDcgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpzZXRTdHlsZShSZW5kZXJTdHlsZSYmIHN0eWxl LCBTdHlsZURpZmZlcmVuY2UgbWluaW1hbFN0eWxlRGkKICAgICBhdXRvIG9sZFN0eWxlID0gbV9z dHlsZS5yZXBsYWNlKFdURk1vdmUoc3R5bGUpKTsKICAgICBib29sIGRldGFjaGVkRnJvbVBhcmVu dCA9ICFwYXJlbnQoKTsKIAotICAgIC8vIE1ha2Ugc3VyZSB3ZSBpbnZhbGlkYXRlIHRoZSBjb250 YWluaW5nIGJsb2NrIGNhY2hlIGZvciBmbG93cyB3aGVuIHRoZSBjb250aWFuaW5nIGJsb2NrIGNv bnRleHQgY2hhbmdlcwotICAgIC8vIHNvIHRoYXQgc3R5bGVEaWRDaGFuZ2UgY2FuIHNhZmVseSB1 c2UgUmVuZGVyQmxvY2s6OmxvY2F0ZUVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KCkKLSAgICBpZiAo b2xkU3R5bGUucG9zaXRpb24oKSAhPSBtX3N0eWxlLnBvc2l0aW9uKCkpCi0gICAgICAgIGFkanVz dEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKCk7Cisg ICAgYWRqdXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVk ZWQob2xkU3R5bGUsIG1fc3R5bGUpOwogCiAgICAgc3R5bGVEaWRDaGFuZ2UoZGlmZiwgJm9sZFN0 eWxlKTsKIApAQCAtMjIxNCwxMSArMjIxMSwyMiBAQCBJbWFnZU9yaWVudGF0aW9uIFJlbmRlckVs ZW1lbnQ6OmltYWdlT3JpZW50YXRpb24oKSBjb25zdAogICAgIHJldHVybiAoaW1hZ2VFbGVtZW50 ICYmICFpbWFnZUVsZW1lbnQtPmFsbG93c09yaWVudGF0aW9uT3ZlcnJpZGUoKSkgPyBJbWFnZU9y aWVudGF0aW9uKEltYWdlT3JpZW50YXRpb246OkZyb21JbWFnZSkgOiBzdHlsZSgpLmltYWdlT3Jp ZW50YXRpb24oKTsKIH0KIAotdm9pZCBSZW5kZXJFbGVtZW50OjphZGp1c3RGcmFnbWVudGVkRmxv d1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCgpCit2b2lkIFJlbmRlckVsZW1l bnQ6OmFkanVzdEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVl ZGVkKGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0 eWxlKQogewogICAgIGlmIChmcmFnbWVudGVkRmxvd1N0YXRlKCkgPT0gTm90SW5zaWRlRnJhZ21l bnRlZEZsb3cpCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIE1ha2Ugc3VyZSB3ZSBpbnZhbGlk YXRlIHRoZSBjb250YWluaW5nIGJsb2NrIGNhY2hlIGZvciBmbG93cyB3aGVuIHRoZSBjb250aWFu aW5nIGJsb2NrIGNvbnRleHQgY2hhbmdlcworICAgIC8vIHNvIHRoYXQgc3R5bGVEaWRDaGFuZ2Ug Y2FuIHNhZmVseSB1c2UgUmVuZGVyQmxvY2s6OmxvY2F0ZUVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93 KCkKKyAgICAvLyBGSVhNRTogU2hhcmUgc29tZSBjb2RlIHdpdGggUmVuZGVyRWxlbWVudDo6Y2Fu Q29udGFpbiouCisgICAgYXV0byBtYXlOb3RCZUNvbnRhaW5pbmdCbG9ja0ZvckRlc2NlbmRhbnRz QW55bW9yZSA9IG9sZFN0eWxlLnBvc2l0aW9uKCkgIT0gbV9zdHlsZS5wb3NpdGlvbigpCisgICAg ICAgIHx8IG9sZFN0eWxlLmhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0eSgpICE9IG1fc3R5bGUu aGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkKKyAgICAgICAgfHwgb2xkU3R5bGUud2lsbENo YW5nZSgpICE9IG5ld1N0eWxlLndpbGxDaGFuZ2UoKQorICAgICAgICB8fCBvbGRTdHlsZS5jb250 YWluc0xheW91dCgpICE9IG5ld1N0eWxlLmNvbnRhaW5zTGF5b3V0KCkKKyAgICAgICAgfHwgb2xk U3R5bGUuY29udGFpbnNTaXplKCkgIT0gbmV3U3R5bGUuY29udGFpbnNTaXplKCk7CisgICAgaWYg KCFtYXlOb3RCZUNvbnRhaW5pbmdCbG9ja0ZvckRlc2NlbmRhbnRzQW55bW9yZSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgLy8gSW52YWxpZGF0ZSB0aGUgY29udGFpbmluZyBibG9jayBjYWNoZXMu CiAgICAgaWYgKGlzPFJlbmRlckJsb2NrPigqdGhpcykpCiAgICAgICAgIGRvd25jYXN0PFJlbmRl ckJsb2NrPigqdGhpcykucmVzZXRFbmNsb3NpbmdGcmFnbWVudGVkRmxvd0FuZENoaWxkSW5mb0lu Y2x1ZGluZ0Rlc2NlbmRhbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1l bnQuaAppbmRleCA1NWFkZDE5NDc2NmUwMjViYTI3NzY0YWE0YzQxNTE2YjhlOTAwMDFmLi5mMzc2 Y2VjYjk3NWNhNzE5ZmRmNjc2ZTVhYzBmYjk1ZDhlMmVkMjIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJFbGVtZW50LmgKQEAgLTMyNiw3ICszMjYsNyBAQCBwcm90ZWN0ZWQ6CiAg ICAgdm9pZCB1cGRhdGVPdXRsaW5lQXV0b0FuY2VzdG9yKGJvb2wgaGFzT3V0bGluZUF1dG8pOwog CiAgICAgdm9pZCByZW1vdmVGcm9tUmVuZGVyRnJhZ21lbnRlZEZsb3dJbmNsdWRpbmdEZXNjZW5k YW50cyhib29sIHNob3VsZFVwZGF0ZVN0YXRlKTsKLSAgICB2b2lkIGFkanVzdEZyYWdtZW50ZWRG bG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKCk7CisgICAgdm9pZCBhZGp1 c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZChjb25z dCBSZW5kZXJTdHlsZSYgb2xkU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSk7CiAK ICAgICBib29sIGlzVmlzaWJsZUluVmlld3BvcnQoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5k ZXggNjhjNjI3OTgzMjAyODcyZjRjZGY5YWVmMzkwODgwZmI1ZTBlMzYzMS4uMDdkZDI3N2YyZDc0 Mjc3MzA1ZTljMDNjOWFhZDVlNDVhMjlkYzRlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCkBAIC02NzEsNiAr NjcxLDEzIEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Om5vcm1hbGl6ZVRyZWVBZnRlclN0eWxl Q2hhbmdlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBSCiAgICAgICAgICAgICBtdWx0aUNvbHVt bkJ1aWxkZXIoKS5yZXN0b3JlQ29sdW1uU3Bhbm5lcnNGb3JDb250YWluZXIocmVuZGVyZXIsIGRv d25jYXN0PFJlbmRlck11bHRpQ29sdW1uRmxvdz4oKmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICAvLyBTdHlsZSBjaGFu Z2UgbWF5IGhhdmUgbW92ZWQgc29tZSBzdWJ0cmVlIG91dCBvZiB0aGUgZnJhZ21lbnRlZCBmbG93 LiBUaGVpciBmbG93IHN0YXRlcyBoYXZlIGFscmVhZHkgYmVlbiB1cGRhdGVkIChzZWUgYWRqdXN0 RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQpCisgICAg ICAgIC8vIGFuZCBoZXJlIGlzIHdoZXJlIHdlIHRha2UgY2FyZSBvZiB0aGUgcmVtYWluaW5nLCBz cGFubmVyIHRyZWUgbXV0YXRpb24uCisgICAgICAgIGZvciAoYXV0byYgZGVzY2VuZGFudCA6IGRl c2NlbmRhbnRzT2ZUeXBlPFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyPihyZW5k ZXJlcikpIHsKKyAgICAgICAgICAgIGlmIChhdXRvKiBjb250YWluaW5nQmxvY2sgPSBkZXNjZW5k YW50LmNvbnRhaW5pbmdCbG9jaygpOyBjb250YWluaW5nQmxvY2sgJiYgY29udGFpbmluZ0Jsb2Nr LT5lbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpICE9IGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KQor ICAgICAgICAgICAgICAgIG11bHRpQ29sdW1uQnVpbGRlcigpLnJlc3RvcmVDb2x1bW5TcGFubmVy c0ZvckNvbnRhaW5lcigqY29udGFpbmluZ0Jsb2NrLCBkb3duY2FzdDxSZW5kZXJNdWx0aUNvbHVt bkZsb3c+KCplbmNsb3NpbmdGcmFnbWVudGVkRmxvdykpOworICAgICAgICB9CiAgICAgfQogfQog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNDk3NTE0MjIxMzViYjdiYzM5NDM5ZTNmMWEyNzMxYjYzNDM5OTY5MC4uYmNiY2Ew Mjg0NDQ5MTFkZWMzMjRmNjQ1OWI3YjY2NGY0ZTg1YmRjZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIyLTAyLTAzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBb UmVuZGVyVHJlZUJ1aWxkZXJdIENsZWFuIHVwIGNvbHVtbiBzcGFubmVycyB3aGVuIHN0eWxlIGNo YW5nZSBhZmZlY3RzIGNvbnRhaW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjA0MgorICAgICAgICA8cmRhcjovLzgzOTc1MzkxPgor CisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogZmFzdC9t dWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1z dHlsZS1jaGFuZ2UtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjItMDItMDIgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJOYXZpZ2F0aW9u UHJlbG9hZGVyIHNob3VsZCBvbmx5IGJlIHVzZWQgb25jZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXIt b24tc3R5bGUtY2hhbmdlLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5 MWZlOTY5MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFz aC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNoLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hh bmdlLWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTc2Y2M1MTY5NTZmNzM5ZDNlNjM4NTQxYzJkYjY5 Mjk2ZDQwNjgwMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv bGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbApAQCAtMCwwICsxLDMx IEBACis8c3R5bGU+CisgIGh0bWwgeworICAgIGNvbHVtbnM6IDFweDsKKyAgfQorICBkaXY6OmJl Zm9yZSB7CisgICAgY29udGVudDogdXJsKCk7CisgIH0KKyAgZnJhbWUgeworICAgIGNvbHVtbi1z cGFuOiBhbGw7CisgIH0KKyAgOmZpcnN0LWNoaWxkIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CisgICAgcm90YXRlOiAwZGVnOworICB9CisgIDpyZWFkLW9ubHkgeworICAgIHRyYW5zbGF0ZTog MDsKKyAgfQorPC9zdHlsZT4KKzwhLS0gUEFTUyBpZiBubyBjcmFzaCBvciBhc3NlcnQuIC0tPgor PHNjcmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFz VGV4dCgpOworICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0VGV4dEF1dG9zaXppbmdFbmFibGVkKHRy dWUpOworICBvbmxvYWQgPSAoKSA9PiB7CisgICAgbGV0IGRpdjAgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCdkaXYnKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRpdjApOworICAg IGRpdjAuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZnJhbWUnKSk7CisgICAg ZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CisgICAgZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvbic7 CisgIH07Cis8L3NjcmlwdD4K 450938 2022-02-04 14:17:42 -0800 2022-02-05 08:38:47 -0800 Patch bug-236042-20220204141741.patch text/plain 10647 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDA5OTU1ZTJjZDIxZWI0 MmQ0NDBhZGFmZDg3YjIyMjkwZTFmM2M0Yy4uOGFjNGY3OWM3NWQwMmM1YTA2ZWM3NGE3YjQzZTcx ZjNlMzJjMjI0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd IENsZWFuIHVwIGNvbHVtbiBzcGFubmVycyB3aGVuIHN0eWxlIGNoYW5nZSBhZmZlY3RzIGNvbnRh aW5pbmcgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNjA0MgorICAgICAgICA8cmRhcjovLzgzOTc1MzkxPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHJlbW92aW5nIHRo ZSBsZWZ0b3ZlciBzcGFubmVycyBhZnRlciBzdHlsZSBjaGFuZ2UsIHRoaXMgcGF0Y2ggYWxzbyBl eHBhbmRzIG9uIHRoZSB0eXBlIG9mIHN0eWxlIGNoYW5nZXMgdGhhdCBtYXkgYWZmZWN0CisgICAg ICAgIHN1YnRyZWUgc3RhdGUgaW5zaWRlIGEgbXVsdGljb2x1bW4gZmxvdy4KKworICAgICAgICBU ZXN0czogZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFz aC5odG1sCisgICAgICAgICAgICAgICBmYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24t c3R5bGUtY2hhbmdlLWNyYXNoMi5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnN0eWxlRGlkQ2hhbmdlKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJFbGVtZW50OjpzZXRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVt ZW50OjphZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5l ZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Om5vcm1hbGl6ZVRyZWVBZnRlclN0eWxlQ2hhbmdlKToKKwog MjAyMi0wMi0wNCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODkwOTguCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCBmYTIxODNjNjRlNWM4YWQ2NDdiMGZiNzRkZWNjMWIx YjFmMGM4M2M4Li4zMmI0NjNjYTA1ZTk4N2QyNmQzN2YwY2RmNmI2NjQ3M2Y3NjM5ODZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTQzMiwxMSArNDMyLDEw IEBAIHN0YXRpYyBib29sIGJvcmRlck9yUGFkZGluZ0xvZ2ljYWxXaWR0aENoYW5nZWQoY29uc3Qg UmVuZGVyU3R5bGUmIG9sZFN0eWxlLCBjb25zCiAKIHZvaWQgUmVuZGVyQmxvY2s6OnN0eWxlRGlk Q2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUp CiB7Ci0gICAgYm9vbCBoYWRUcmFuc2Zvcm0gPSBoYXNUcmFuc2Zvcm0oKTsKICAgICBSZW5kZXJC b3g6OnN0eWxlRGlkQ2hhbmdlKGRpZmYsIG9sZFN0eWxlKTsKIAotICAgIGlmIChoYWRUcmFuc2Zv cm0gIT0gaGFzVHJhbnNmb3JtKCkpCi0gICAgICAgIGFkanVzdEZyYWdtZW50ZWRGbG93U3RhdGVP bkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKCk7CisgICAgaWYgKG9sZFN0eWxlKQorICAg ICAgICBhZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5l ZWRlZCgqb2xkU3R5bGUsIHN0eWxlKCkpOwogCiAgICAgcHJvcGFnYXRlU3R5bGVUb0Fub255bW91 c0NoaWxkcmVuKFByb3BhZ2F0ZVRvQmxvY2tDaGlsZHJlbk9ubHkpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggYjdjNGVkOGU0NTYwYjRlYjVjZTJk NzE2Nzk4YmZiN2ZjODBhOWNiMy4uMTU4NzdhMTQ0NTMzOTM0Mjc3OTA4ODdhNmMxZWFkMmZiZDdh MzZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAt NTMyLDEwICs1MzIsNyBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnNldFN0eWxlKFJlbmRlclN0eWxl JiYgc3R5bGUsIFN0eWxlRGlmZmVyZW5jZSBtaW5pbWFsU3R5bGVEaQogICAgIGF1dG8gb2xkU3R5 bGUgPSBtX3N0eWxlLnJlcGxhY2UoV1RGTW92ZShzdHlsZSkpOwogICAgIGJvb2wgZGV0YWNoZWRG cm9tUGFyZW50ID0gIXBhcmVudCgpOwogCi0gICAgLy8gTWFrZSBzdXJlIHdlIGludmFsaWRhdGUg dGhlIGNvbnRhaW5pbmcgYmxvY2sgY2FjaGUgZm9yIGZsb3dzIHdoZW4gdGhlIGNvbnRpYW5pbmcg YmxvY2sgY29udGV4dCBjaGFuZ2VzCi0gICAgLy8gc28gdGhhdCBzdHlsZURpZENoYW5nZSBjYW4g c2FmZWx5IHVzZSBSZW5kZXJCbG9jazo6bG9jYXRlRW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKQot ICAgIGlmIChvbGRTdHlsZS5wb3NpdGlvbigpICE9IG1fc3R5bGUucG9zaXRpb24oKSkKLSAgICAg ICAgYWRqdXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVk ZWQoKTsKKyAgICBhZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFu Z2VJZk5lZWRlZChvbGRTdHlsZSwgbV9zdHlsZSk7CiAKICAgICBzdHlsZURpZENoYW5nZShkaWZm LCAmb2xkU3R5bGUpOwogCkBAIC0yMjE0LDExICsyMjExLDIyIEBAIEltYWdlT3JpZW50YXRpb24g UmVuZGVyRWxlbWVudDo6aW1hZ2VPcmllbnRhdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIChpbWFn ZUVsZW1lbnQgJiYgIWltYWdlRWxlbWVudC0+YWxsb3dzT3JpZW50YXRpb25PdmVycmlkZSgpKSA/ IEltYWdlT3JpZW50YXRpb24oSW1hZ2VPcmllbnRhdGlvbjo6RnJvbUltYWdlKSA6IHN0eWxlKCku aW1hZ2VPcmllbnRhdGlvbigpOwogfQogCi12b2lkIFJlbmRlckVsZW1lbnQ6OmFkanVzdEZyYWdt ZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVlZGVkKCkKK3ZvaWQgUmVu ZGVyRWxlbWVudDo6YWRqdXN0RnJhZ21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hh bmdlSWZOZWVkZWQoY29uc3QgUmVuZGVyU3R5bGUmIG9sZFN0eWxlLCBjb25zdCBSZW5kZXJTdHls ZSYgbmV3U3R5bGUpCiB7CiAgICAgaWYgKGZyYWdtZW50ZWRGbG93U3RhdGUoKSA9PSBOb3RJbnNp ZGVGcmFnbWVudGVkRmxvdykKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gTWFrZSBzdXJlIHdl IGludmFsaWRhdGUgdGhlIGNvbnRhaW5pbmcgYmxvY2sgY2FjaGUgZm9yIGZsb3dzIHdoZW4gdGhl IGNvbnRpYW5pbmcgYmxvY2sgY29udGV4dCBjaGFuZ2VzCisgICAgLy8gc28gdGhhdCBzdHlsZURp ZENoYW5nZSBjYW4gc2FmZWx5IHVzZSBSZW5kZXJCbG9jazo6bG9jYXRlRW5jbG9zaW5nRnJhZ21l bnRlZEZsb3coKQorICAgIC8vIEZJWE1FOiBTaGFyZSBzb21lIGNvZGUgd2l0aCBSZW5kZXJFbGVt ZW50OjpjYW5Db250YWluKi4KKyAgICBhdXRvIG1heU5vdEJlQ29udGFpbmluZ0Jsb2NrRm9yRGVz Y2VuZGFudHNBbnltb3JlID0gb2xkU3R5bGUucG9zaXRpb24oKSAhPSBtX3N0eWxlLnBvc2l0aW9u KCkKKyAgICAgICAgfHwgb2xkU3R5bGUuaGFzVHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkgIT0g bV9zdHlsZS5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKQorICAgICAgICB8fCBvbGRTdHls ZS53aWxsQ2hhbmdlKCkgIT0gbmV3U3R5bGUud2lsbENoYW5nZSgpCisgICAgICAgIHx8IG9sZFN0 eWxlLmNvbnRhaW5zTGF5b3V0KCkgIT0gbmV3U3R5bGUuY29udGFpbnNMYXlvdXQoKQorICAgICAg ICB8fCBvbGRTdHlsZS5jb250YWluc1NpemUoKSAhPSBuZXdTdHlsZS5jb250YWluc1NpemUoKTsK KyAgICBpZiAoIW1heU5vdEJlQ29udGFpbmluZ0Jsb2NrRm9yRGVzY2VuZGFudHNBbnltb3JlKQor ICAgICAgICByZXR1cm47CisKICAgICAvLyBJbnZhbGlkYXRlIHRoZSBjb250YWluaW5nIGJsb2Nr IGNhY2hlcy4KICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KCp0aGlzKSkKICAgICAgICAgZG93bmNh c3Q8UmVuZGVyQmxvY2s+KCp0aGlzKS5yZXNldEVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93QW5kQ2hp bGRJbmZvSW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5oCmluZGV4IDU1YWRkMTk0NzY2ZTAyNWJhMjc3NjRhYTRjNDE1MTZiOGU5MDAw MWYuLmYzNzZjZWNiOTc1Y2E3MTlmZGY2NzZlNWFjMGZiOTVkOGUyZWQyMjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMzI2LDcgKzMyNiw3IEBAIHByb3Rl Y3RlZDoKICAgICB2b2lkIHVwZGF0ZU91dGxpbmVBdXRvQW5jZXN0b3IoYm9vbCBoYXNPdXRsaW5l QXV0byk7CiAKICAgICB2b2lkIHJlbW92ZUZyb21SZW5kZXJGcmFnbWVudGVkRmxvd0luY2x1ZGlu Z0Rlc2NlbmRhbnRzKGJvb2wgc2hvdWxkVXBkYXRlU3RhdGUpOwotICAgIHZvaWQgYWRqdXN0RnJh Z21lbnRlZEZsb3dTdGF0ZU9uQ29udGFpbmluZ0Jsb2NrQ2hhbmdlSWZOZWVkZWQoKTsKKyAgICB2 b2lkIGFkanVzdEZyYWdtZW50ZWRGbG93U3RhdGVPbkNvbnRhaW5pbmdCbG9ja0NoYW5nZUlmTmVl ZGVkKGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0 eWxlKTsKIAogICAgIGJvb2wgaXNWaXNpYmxlSW5WaWV3cG9ydCgpIGNvbnN0OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy LmNwcAppbmRleCA2OGM2Mjc5ODMyMDI4NzJmNGNkZjlhZWYzOTA4ODBmYjVlMGUzNjMxLi41M2Vh Zjg4YTFjNTU3ZTg3OTk1ODQ2OTk2ZjhiZDM2Y2FmZjNmMzIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAg LTY3MSw2ICs2NzEsMjAgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6bm9ybWFsaXplVHJlZUFm dGVyU3R5bGVDaGFuZ2UoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIFIKICAgICAgICAgICAgIG11 bHRpQ29sdW1uQnVpbGRlcigpLnJlc3RvcmVDb2x1bW5TcGFubmVyc0ZvckNvbnRhaW5lcihyZW5k ZXJlciwgZG93bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93PigqZW5jbG9zaW5nRnJhZ21lbnRl ZEZsb3cpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQorCisgICAgICAgIC8vIFN0 eWxlIGNoYW5nZSBtYXkgaGF2ZSBtb3ZlZCBzb21lIHN1YnRyZWUgb3V0IG9mIHRoZSBmcmFnbWVu dGVkIGZsb3cuIFRoZWlyIGZsb3cgc3RhdGVzIGhhdmUgYWxyZWFkeSBiZWVuIHVwZGF0ZWQgKHNl ZSBhZGp1c3RGcmFnbWVudGVkRmxvd1N0YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRl ZCkKKyAgICAgICAgLy8gYW5kIGhlcmUgaXMgd2hlcmUgd2UgdGFrZSBjYXJlIG9mIHRoZSByZW1h aW5pbmcsIHNwYW5uZXIgdHJlZSBtdXRhdGlvbi4KKyAgICAgICAgV2Vha0hhc2hTZXQ8UmVuZGVy RWxlbWVudD4gc3Bhbm5lckNvbnRhaW5pbmdCbG9ja1NldDsKKyAgICAgICAgZm9yIChhdXRvJiBk ZXNjZW5kYW50IDogZGVzY2VuZGFudHNPZlR5cGU8UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxh Y2Vob2xkZXI+KHJlbmRlcmVyKSkgeworICAgICAgICAgICAgaWYgKGF1dG8qIGNvbnRhaW5pbmdC bG9jayA9IGRlc2NlbmRhbnQuY29udGFpbmluZ0Jsb2NrKCk7IGNvbnRhaW5pbmdCbG9jayAmJiBj b250YWluaW5nQmxvY2stPmVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KCkgIT0gZW5jbG9zaW5nRnJh Z21lbnRlZEZsb3cpCisgICAgICAgICAgICAgICAgc3Bhbm5lckNvbnRhaW5pbmdCbG9ja1NldC5h ZGQoKmNvbnRhaW5pbmdCbG9jayk7CisgICAgICAgIH0KKyAgICAgICAgYXV0byBvbGRFbmNsb3Np bmdGcmFnbWVudGVkRmxvdyA9IFdlYWtQdHIgeyAqZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cgfTsK KyAgICAgICAgZm9yIChhdXRvJiBjb250YWluaW5nQmxvY2sgOiBzcGFubmVyQ29udGFpbmluZ0Js b2NrU2V0KSB7CisgICAgICAgICAgICBpZiAoIW9sZEVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KQor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgbXVsdGlDb2x1bW5CdWlsZGVyKCku cmVzdG9yZUNvbHVtblNwYW5uZXJzRm9yQ29udGFpbmVyKGNvbnRhaW5pbmdCbG9jaywgZG93bmNh c3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93Pigqb2xkRW5jbG9zaW5nRnJhZ21lbnRlZEZsb3cpKTsK KyAgICAgICAgfQogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcwZTA5YTc4MDNiZTBlYzQ3YjJlODdkZjdj MWY3ODFkZjY1NjdjNjkuLjY3YTk5N2VjMDAwYmZlNTAzMmI4MzY2YmY3MTk2NGUxMTQ4M2NiZTkg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0wMi0wNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBDbGVhbiB1cCBjb2x1bW4g c3Bhbm5lcnMgd2hlbiBzdHlsZSBjaGFuZ2UgYWZmZWN0cyBjb250YWluaW5nIGJsb2NrCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYwNDIKKyAgICAg ICAgPHJkYXI6Ly84Mzk3NTM5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1j aGFuZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29s L2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNoLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jh c2gyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9sZWZ0b3Zl ci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaDIuaHRtbDogQWRkZWQuCisKIDIwMjItMDIt MDQgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJldmVydGluZyByMjg5MDk4LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5 bGUtY2hhbmdlLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5 MjdhZDc4ZTY0YjBhYWQ3YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9tdWx0aWNvbC9sZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211 bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNyYXNoLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L211bHRpY29sL2xlZnRvdmVyLXNwYW5uZXItb24tc3R5bGUtY2hhbmdlLWNy YXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNTc2Y2M1MTY5NTZmNzM5ZDNlNjM4NTQxYzJkYjY5Mjk2ZDQw NjgwMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92 ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2guaHRtbApAQCAtMCwwICsxLDMxIEBACis8 c3R5bGU+CisgIGh0bWwgeworICAgIGNvbHVtbnM6IDFweDsKKyAgfQorICBkaXY6OmJlZm9yZSB7 CisgICAgY29udGVudDogdXJsKCk7CisgIH0KKyAgZnJhbWUgeworICAgIGNvbHVtbi1zcGFuOiBh bGw7CisgIH0KKyAgOmZpcnN0LWNoaWxkIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg cm90YXRlOiAwZGVnOworICB9CisgIDpyZWFkLW9ubHkgeworICAgIHRyYW5zbGF0ZTogMDsKKyAg fQorPC9zdHlsZT4KKzwhLS0gUEFTUyBpZiBubyBjcmFzaCBvciBhc3NlcnQuIC0tPgorPHNjcmlw dD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgp OworICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0VGV4dEF1dG9zaXppbmdFbmFibGVkKHRydWUpOwor ICBvbmxvYWQgPSAoKSA9PiB7CisgICAgbGV0IGRpdjAgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCdkaXYnKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRpdjApOworICAgIGRpdjAu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZnJhbWUnKSk7CisgICAgZG9jdW1l bnQuYm9keS5vZmZzZXRUb3A7CisgICAgZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvbic7CisgIH07 Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92 ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2gyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2gy LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5MjdhZDc4ZTY0YjBhYWQ3 YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9s ZWZ0b3Zlci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaDItZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEgQEAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9sZWZ0b3Zl ci1zcGFubmVyLW9uLXN0eWxlLWNoYW5nZS1jcmFzaDIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv bXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1vbi1zdHlsZS1jaGFuZ2UtY3Jhc2gyLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uOGZkMWFhODBhYTY3NmIwY2FiYjIyYTE5MzhmYTBjNTEyZjI1Y2I4NAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbGVmdG92ZXItc3Bhbm5lci1v bi1zdHlsZS1jaGFuZ2UtY3Jhc2gyLmh0bWwKQEAgLTAsMCArMSwyOCBAQAorPHN0eWxlPgorICBo dG1sIHsKKyAgICBjb2x1bW5zOiAxcHg7CisgIH0KKyAgZGl2IHsKKyAgICBwb3NpdGlvbjogYWJz b2x1dGU7CisgIH0KKyAgdGFibGUgeworICAgIGNvbHVtbi1zcGFuOiBhbGw7CisgIH0KKyAgOnJl YWQtb25seSB7CisgICAgdHJhbnNsYXRlOiAwOworICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KKzwh LS0gUEFTUyBpZiBubyBjcmFzaCBvciBhc3NlcnQuIC0tPgorICAKKyAgaWYgKHdpbmRvdy50ZXN0 UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAKKyAgb25sb2FkID0gKCkg PT4geworICAgIGxldCBkaXYwID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmQoZGl2MCk7CisgICAgZGl2MC5hcHBlbmQoZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgndGFibGUnKSk7CisgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CisgICAg ZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvbic7CisgIH07Cis8L3NjcmlwdD4K