238998 2022-04-08 05:25:04 -0700 REGRESSION (Safari 15.4): Focused element doesn't render outline when it has an underline 2022-04-09 10:56:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering Safari 14 Mac (Apple Silicon) macOS 11 RESOLVED FIXED InRadar P2 Normal --- 1 matted47 zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1859685 0 matted47 2022-04-08 05:25:04 -0700 When an element has an outline and underline set on it's focus style, the outline isn't rendered. The following won't render the outline, but setting the text-decoration to none does. Tabbing back & forth does sometimes show the outline, which is also sometimes partially left there once focus is moved on. a:focus, button:focus { outline: 6px double blue; text-decoration: underline; } 1859703 1 gsnedders 2022-04-08 07:21:12 -0700 > Tabbing back & forth does sometimes show the outline, which is also sometimes partially left there once focus is moved on. This makes me thinks its a repaint under-invalidation bug? 1859747 2 457078 zalan 2022-04-08 08:51:58 -0700 Created attachment 457078 Test reduction 1859748 3 webkit-bug-importer 2022-04-08 08:52:27 -0700 <rdar://problem/91484512> 1859749 4 zalan 2022-04-08 08:53:27 -0700 It looks like ink overflow issue (that we fail to compute the proper ink overflow for outline). 1859750 5 webkit-bug-importer 2022-04-08 08:53:38 -0700 <rdar://problem/91484572> 1859776 6 zalan 2022-04-08 09:55:26 -0700 Interestingly outline does not show up as ink overflow (as opposed to like text-shadow). Instead it needs some special handling (expanding repaint top/bottom etc) which has not been adopted in the modern line layout integration layer. 1859894 7 ap 2022-04-08 14:40:52 -0700 The double outline is visible when using Safari 15.3 on macOS 12.2.1, so this looks like a regression. I can reproduce with Safari 15.4. 1859910 8 zalan 2022-04-08 15:09:00 -0700 (In reply to Alexey Proskuryakov from comment #7) > The double outline is visible when using Safari 15.3 on macOS 12.2.1, so > this looks like a regression. I can reproduce with Safari 15.4. Sure it is. -> "which has not been adopted in the modern line layout integration layer." 1859912 9 zalan 2022-04-08 15:32:51 -0700 (In reply to zalan from comment #8) > (In reply to Alexey Proskuryakov from comment #7) > > The double outline is visible when using Safari 15.3 on macOS 12.2.1, so > > this looks like a regression. I can reproduce with Safari 15.4. > Sure it is. -> "which has not been adopted in the modern line layout > integration layer." I should have been more explicit about it by adding the regression prefix. 1859934 10 457126 zalan 2022-04-08 16:34:27 -0700 Created attachment 457126 Patch 1860010 11 457160 zalan 2022-04-09 06:32:36 -0700 Created attachment 457160 Patch 1860032 12 ews-feeder 2022-04-09 10:56:29 -0700 Committed r292679 (249471@main): <https://commits.webkit.org/249471@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457160. 457078 2022-04-08 08:51:58 -0700 2022-04-08 08:51:58 -0700 Test reduction 238998.html text/html 207 zalan PHN0eWxlPgphOmZvY3VzIHsKICBvdXRsaW5lOiA2cHggZG91YmxlIGJsdWU7Cn0KPC9zdHlsZT4K PGEgaWQ9Zm9jdXNfb3V0bGluZSBocmVmPSJub25lIj5QQVNTIGlmIHRoZSBkb3VibGUgb3V0bGlu ZSBpcyB2aXNpYmxlPC9hPgo8c2NyaXB0PgpzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgewogIGZvY3Vz X291dGxpbmUuZm9jdXMoKTsKfSwgNTAwKTsKPC9zY3JpcHQ+ 457126 2022-04-08 16:34:27 -0700 2022-04-09 06:32:34 -0700 Patch bug-238998-20220408163427.patch text/plain 14630 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1YzU0YTU0MmE3ZTFj ZTc0NzdhMDM2ZWQxMWZiMWM2NDNmMjMzNy4uYzE1NzE0ZGIzNWQ5YjQ2NzcwZWYwMjU2ZWUyZTBi M2EzMmZhOTM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIyLTA0LTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChTYWZhcmkg MTUuNCk6IEZvY3VzZWQgZWxlbWVudCBkb2Vzbid0IHJlbmRlciBvdXRsaW5lIHdoZW4gaXQgaGFz IGFuIHVuZGVybGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM4OTk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MTQ4NDUxMj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGlsZSBvdXRsaW5lIGlz IHN1cHBvc2VkIHRvIGJlIHBhcnQgb2YgdGhlIGluayBvdmVyZmxvdygxKSwgV2ViS2l0IGhpc3Rv cmljYWxseSBoYXMgYmVlbgorICAgICAgICB0cmVhdGluZyBpdCBhcyBhIHNwZWNpYWwgIm5vbiBp bmsgb3ZlcmZsb3ciIHR5cGUgb2Ygb3ZlcmZsb3cuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBp biBwcmVwYXJhdGlvbiBmb3IgdHJhbnNpdGlvbmluZyB0aGUgb3V0bGluZSB0byByZWd1bGFyIGlu ayBvdmVyZmxvdy4KKworICAgICAgICBGaXJzdCB3ZSBzdGFydCB0cmVhdGluZyBvdXRsaW5lIGFz IHBhcnQgb2YgaW5rIG92ZXJmbG93IHdpdGhpbiBJRkMgYW5kCisgICAgICAgIGhhbmRsZSBpdCBh cyBzcGVjaWFsIHJlcGFpbnQgY29udGVudCBvbmx5IGF0IHRoZSBibG9jayAoUmVuZGVyQmxvY2tG bG93KSBsZXZlbC4KKworICAgICAgICBUZXN0OiBmYXN0L3JlcGFpbnQvaW5jb3JyZWN0LW91dGxp bmUtcmVwYWludC5odG1sCisKKyAgICAgICAgKDEpIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3Mt b3ZlcmZsb3ctMy8jaW5rCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OmNvbXB1dGVJbmtPdmVyZmxvd0ZvcklubGluZUxldmVsQm94KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBl bmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3gp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlG b3JEaXNwbGF5Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZUJveFNoYWRv d0lua092ZXJmbG93KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50OjpoYXNDb250ZW50IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudDo6aGFzVmlz dWFsT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OklubGluZUNvbnRlbnQ6OnNldEhhc1Zpc3VhbE92ZXJmbG93KToKKyAgICAgICAgKiBsYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6 OmNyZWF0ZURpc3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dE1v ZGVybkxpbmVzKTogVGhpcyBtYXkgY2F1c2Ugb3Zlcmx5IGluZmxhdGVkIHJlcGFpbnRUb3AvQm90 dG9tIHdoZW4KKyAgICAgICAgdGhlIGluayBvdmVyZmxvdyBpcyBub3Qgb3V0bGluZSBiYXNlZCBi dXQgd2Ugd2lsbCBhbnl3YXkgdHJpZ2dlciByZXBhaW50IG9uIHRoYXQgcGFydCBsYXRlciB3aGVu IHdlIHByb2Nlc3MgaW5rIG92ZXJmbG93LgorCiAyMDIyLTA0LTA4ICBSb2IgQnVpcyAgPHJidWlz QGlnYWxpYS5jb20+CiAKICAgICAgICAgVGFrZSB0b3AgbGF5ZXJzIGludG8gYWNjb3VudCBpbiBh ZGRMYXllcnMvcmVtb3ZlTGF5ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggODc1NmUzYjZm ZTgwZTIwMGE0ZTBiOWM4ZGQxYWYzZmJjN2EzYzRmOC4uMTk0ZmQ3YWMxYWI4ZTAxMTI4YzFmY2Nm MDdiYzQ4ODk4ZjgwZjk5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMTA3LDE5ICsxMDcs MzQgQEAgRGlzcGxheUJveGVzIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YnVpbGQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JgogICAgIHJldHVybiBib3hlczsKIH0KIAotc3Rh dGljIGlubGluZSBib29sIGNvbXB1dGVCb3hTaGFkb3dJbmtPdmVyZmxvdyhjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUsIEZsb2F0UmVjdCYgaW5rT3ZlcmZsb3cpCitzdGF0aWMgaW5saW5lIGJvb2wg Y29tcHV0ZUlua092ZXJmbG93Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlLCBGbG9hdFJlY3QmIGlua092ZXJmbG93KQogewotICAgIGF1dG8gdG9wQm94U2hhZG93ID0g TGF5b3V0VW5pdCB7IH07Ci0gICAgYXV0byBib3R0b21Cb3hTaGFkb3cgPSBMYXlvdXRVbml0IHsg fTsKLSAgICBzdHlsZS5nZXRCb3hTaGFkb3dCbG9ja0RpcmVjdGlvbkV4dGVudCh0b3BCb3hTaGFk b3csIGJvdHRvbUJveFNoYWRvdyk7CisgICAgYXV0byBoYXNWaXN1YWxPdmVyZmxvdyA9IGZhbHNl OwogCi0gICAgYXV0byBsZWZ0Qm94U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgYXV0byBy aWdodEJveFNoYWRvdyA9IExheW91dFVuaXQgeyB9OwotICAgIHN0eWxlLmdldEJveFNoYWRvd0lu bGluZURpcmVjdGlvbkV4dGVudChsZWZ0Qm94U2hhZG93LCByaWdodEJveFNoYWRvdyk7Ci0gICAg aWYgKCF0b3BCb3hTaGFkb3cgJiYgIWJvdHRvbUJveFNoYWRvdyAmJiAhbGVmdEJveFNoYWRvdyAm JiAhcmlnaHRCb3hTaGFkb3cpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbmtPdmVyZmxv dy5pbmZsYXRlKGxlZnRCb3hTaGFkb3cudG9GbG9hdCgpLCB0b3BCb3hTaGFkb3cudG9GbG9hdCgp LCByaWdodEJveFNoYWRvdy50b0Zsb2F0KCksIGJvdHRvbUJveFNoYWRvdy50b0Zsb2F0KCkpOwot ICAgIHJldHVybiB0cnVlOworICAgIGF1dG8gaW5mbGF0ZVdpdGhPdXRsaW5lID0gWyZdIHsKKyAg ICAgICAgaWYgKCFzdHlsZS5oYXNPdXRsaW5lSW5WaXN1YWxPdmVyZmxvdygpKQorICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICBpbmtPdmVyZmxvdy5pbmZsYXRlKHN0eWxlLm91dGxpbmVTaXpl KCkpOworICAgICAgICBoYXNWaXN1YWxPdmVyZmxvdyA9IHRydWU7CisgICAgfTsKKyAgICBpbmZs YXRlV2l0aE91dGxpbmUoKTsKKworICAgIGF1dG8gaW5mbGF0ZVdpdGhCb3hTaGFkb3cgPSBbJl0g eworICAgICAgICBhdXRvIHRvcEJveFNoYWRvdyA9IExheW91dFVuaXQgeyB9OworICAgICAgICBh dXRvIGJvdHRvbUJveFNoYWRvdyA9IExheW91dFVuaXQgeyB9OworICAgICAgICBzdHlsZS5nZXRC b3hTaGFkb3dCbG9ja0RpcmVjdGlvbkV4dGVudCh0b3BCb3hTaGFkb3csIGJvdHRvbUJveFNoYWRv dyk7CisKKyAgICAgICAgYXV0byBsZWZ0Qm94U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07CisgICAg ICAgIGF1dG8gcmlnaHRCb3hTaGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgc3R5bGUu Z2V0Qm94U2hhZG93SW5saW5lRGlyZWN0aW9uRXh0ZW50KGxlZnRCb3hTaGFkb3csIHJpZ2h0Qm94 U2hhZG93KTsKKyAgICAgICAgaWYgKCF0b3BCb3hTaGFkb3cgJiYgIWJvdHRvbUJveFNoYWRvdyAm JiAhbGVmdEJveFNoYWRvdyAmJiAhcmlnaHRCb3hTaGFkb3cpCisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIGlua092ZXJmbG93LmluZmxhdGUobGVmdEJveFNoYWRvdy50b0Zsb2F0KCksIHRv cEJveFNoYWRvdy50b0Zsb2F0KCksIHJpZ2h0Qm94U2hhZG93LnRvRmxvYXQoKSwgYm90dG9tQm94 U2hhZG93LnRvRmxvYXQoKSk7CisgICAgICAgIGhhc1Zpc3VhbE92ZXJmbG93ID0gdHJ1ZTsKKyAg ICB9OworICAgIGluZmxhdGVXaXRoQm94U2hhZG93KCk7CisKKyAgICByZXR1cm4gaGFzVmlzdWFs T3ZlcmZsb3c7CiB9CiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRU ZXh0RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mIGxpbmVSdW4sIGNvbnN0IElubGluZVJlY3Qm IHRleHRSdW5SZWN0LCBEaXNwbGF5Qm94ZXMmIGJveGVzKQpAQCAtMjEwLDcgKzIyNSw3IEBAIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRBdG9taWNJbmxpbmVMZXZlbERp c3BsYXlCb3goY29uc3QgTGluZTo6CiAgICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlv dXRCb3goKTsKICAgICBhdXRvIGlua092ZXJmbG93ID0gWyZdIHsKICAgICAgICAgYXV0byBpbmtP dmVyZmxvdyA9IEZsb2F0UmVjdCB7IGJvcmRlckJveFJlY3QgfTsKLSAgICAgICAgY29tcHV0ZUJv eFNoYWRvd0lua092ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHls ZSgpIDogbGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KTsKKyAgICAgICAgY29tcHV0ZUlu a092ZXJmbG93Rm9ySW5saW5lTGV2ZWxCb3goIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0 TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpOwogICAgICAgICAv LyBBdG9taWMgaW5saW5lIGJveCBjb250cmlidXRlIHRvIHRoZWlyIGlubGluZSBib3ggcGFyZW50 cyBpbmsgb3ZlcmZsb3cgYXQgYWxsIHRpbWVzIChlLmcuIDxzcGFuPjxpbWc+PC9zcGFuPikuCiAg ICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gbV9jb250ZW50SGFzSW5rT3ZlcmZsb3cg fHwgJmxheW91dEJveC5wYXJlbnQoKSAhPSAmcm9vdCgpOwogICAgICAgICByZXR1cm4gaW5rT3Zl cmZsb3c7CkBAIC0yNjAsNyArMjc1LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiBsaW4KIAogICAg IGF1dG8gaW5rT3ZlcmZsb3cgPSBbJl0gewogICAgICAgICBhdXRvIGlua092ZXJmbG93ID0gRmxv YXRSZWN0IHsgaW5saW5lQm94Qm9yZGVyQm94IH07Ci0gICAgICAgIG1fY29udGVudEhhc0lua092 ZXJmbG93ID0gY29tcHV0ZUJveFNoYWRvd0lua092ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91 dEJveC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8 fCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdzsKKyAgICAgICAgbV9jb250ZW50SGFzSW5rT3ZlcmZs b3cgPSBjb21wdXRlSW5rT3ZlcmZsb3dGb3JJbmxpbmVMZXZlbEJveCghbV9saW5lSW5kZXggPyBs YXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxv dykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7CiAgICAgICAgIHJldHVybiBpbmtPdmVyZmxv dzsKICAgICB9OwogICAgIEFTU0VSVChpbmxpbmVCb3guaXNJbmxpbmVCb3goKSk7CkBAIC0yODcs NyArMzAyLDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFNwYW5u aW5nSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjoKICAgICBhdXRvJiBsYXlvdXRCb3gg PSBsaW5lUnVuLmxheW91dEJveCgpOwogICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBbJl0gewogICAg ICAgICBhdXRvIGlua092ZXJmbG93ID0gRmxvYXRSZWN0IHsgaW5saW5lQm94Qm9yZGVyQm94IH07 Ci0gICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0ZUJveFNoYWRvd0lua092 ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0 Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8fCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdzsKKyAg ICAgICAgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3cgPSBjb21wdXRlSW5rT3ZlcmZsb3dGb3JJbmxp bmVMZXZlbEJveCghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxh eW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7 CiAgICAgICAgIHJldHVybiBpbmtPdmVyZmxvdzsKICAgICB9OwogICAgIEFTU0VSVCghaW5saW5l Qm94LmlzRmlyc3RCb3goKSk7CkBAIC01MzIsNyArNTQ3LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChzaXplX3Qg ZGlzcGwKIAogICAgIGF1dG8gY29tcHV0ZUlua092ZXJmbG93ID0gWyZdIHsKICAgICAgICAgYXV0 byBpbmtPdmVyZmxvdyA9IEZsb2F0UmVjdCB7IGRpc3BsYXlCb3gudmlzdWFsUmVjdElnbm9yaW5n QmxvY2tEaXJlY3Rpb24oKSB9OwotICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNv bXB1dGVCb3hTaGFkb3dJbmtPdmVyZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RM aW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50 SGFzSW5rT3ZlcmZsb3c7CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0 ZUlua092ZXJmbG93Rm9ySW5saW5lTGV2ZWxCb3goIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZp cnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpIHx8IG1fY29u dGVudEhhc0lua092ZXJmbG93OwogICAgICAgICBkaXNwbGF5Qm94LmFkanVzdElua092ZXJmbG93 KGlua092ZXJmbG93KTsKICAgICB9OwogICAgIGNvbXB1dGVJbmtPdmVyZmxvdygpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAppbmRleCA5MjE0MDkxMDkxMjg1ZjhjNWJk YWFkOGQ2ZTZkODAzZDY0YjFkYzU1Li41ZDQzMjU2OWViNDQ4NmFmNjExN2Y2YjQxOTIzN2ZiN2E4 ZTU5OGI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcApAQCAtNDUs NyArNDUsNyBAQCBib29sIElubGluZUNvbnRlbnQ6Omhhc0NvbnRlbnQoKSBjb25zdAogewogICAg IEFTU0VSVChib3hlcy5pc0VtcHR5KCkgfHwgYm94ZXNbMF0uaXNSb290SW5saW5lQm94KCkpOwog ICAgIHJldHVybiBib3hlcy5zaXplKCkgPiAxOwotfTsKK30KIAogSXRlcmF0b3JSYW5nZTxjb25z dCBJbmxpbmVEaXNwbGF5OjpCb3gqPiBJbmxpbmVDb250ZW50Ojpib3hlc0ZvclJlY3QoY29uc3Qg TGF5b3V0UmVjdCYgcmVjdCkgY29uc3QKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnQuaAppbmRleCA2NDJjZDVlYTQxYTc5Nzg3ZTQxY2FlZTZhZGZiMDkyNmVlZTczY2NiLi43OWRk Yjk3ZTY5ZjE5YjhkYTZiNmIyOGQ1N2EwZjE0NGE3NWY1ZjQxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uSW5saW5lQ29udGVudC5oCkBAIC02NCw2ICs2NCw5IEBAIHN0cnVjdCBJbmxpbmVDb250ZW50 IDogcHVibGljIFJlZkNvdW50ZWQ8SW5saW5lQ29udGVudD4gewogICAgIGJvb2wgaGFzTXVsdGls aW5lUGFpbnRPdmVybGFwIHsgZmFsc2UgfTsKIAogICAgIGJvb2wgaGFzQ29udGVudCgpIGNvbnN0 OworCisgICAgYm9vbCBoYXNWaXN1YWxPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1faGFzVmlz dWFsT3ZlcmZsb3c7IH0KKyAgICB2b2lkIHNldEhhc1Zpc3VhbE92ZXJmbG93KCkgeyBtX2hhc1Zp c3VhbE92ZXJmbG93ID0gdHJ1ZTsgfQogICAgIAogICAgIGNvbnN0IExpbmUmIGxpbmVGb3JCb3go Y29uc3QgSW5saW5lRGlzcGxheTo6Qm94JiBib3gpIGNvbnN0IHsgcmV0dXJuIGxpbmVzW2JveC5s aW5lSW5kZXgoKV07IH0KIApAQCAtOTYsNiArOTksNyBAQCBwcml2YXRlOgogCiAgICAgdXNpbmcg SW5saW5lQm94SW5kZXhDYWNoZSA9IEhhc2hNYXA8Q2hlY2tlZFJlZjxjb25zdCBMYXlvdXQ6OkJv eD4sIFZlY3RvcjxzaXplX3Q+PjsKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVC b3hJbmRleENhY2hlPiBtX2lubGluZUJveEluZGV4Q2FjaGU7CisgICAgYm9vbCBtX2hhc1Zpc3Vh bE92ZXJmbG93IHsgZmFsc2UgfTsKIH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmN0aW9uPiB2 b2lkIElubGluZUNvbnRlbnQ6OnRyYXZlcnNlTm9uUm9vdElubGluZUJveGVzKGNvbnN0IExheW91 dDo6Qm94JiBsYXlvdXRCb3gsIEZ1bmN0aW9uJiYgZnVuY3Rpb24pCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKaW5kZXggZDc3NzNjZGY5Mzc4Mjdm Nzk1OGNlMTgyNWY3N2I5YzUyMDY1NDQyMy4uMzM4YjRhOGY0NDQwY2M3NWYyYjNlN2NiYWEwZDZj ZjlmYWYzYTI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmNwcApAQCAtOTAsNyArOTAsNyBAQCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpj cmVhdGVEaXNwbGF5TGluZXMoTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubAogICAg IGlubGluZUNvbnRlbnQubGluZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShsaW5lcy5zaXplKCkp OwogICAgIGZvciAoc2l6ZV90IGxpbmVJbmRleCA9IDA7IGxpbmVJbmRleCA8IGxpbmVzLnNpemUo KTsgKytsaW5lSW5kZXgpIHsKICAgICAgICAgYXV0byYgbGluZSA9IGxpbmVzW2xpbmVJbmRleF07 Ci0gICAgICAgIGF1dG8gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCA9IEZsb2F0UmVjdCB7IGxpbmUu c2Nyb2xsYWJsZU92ZXJmbG93KCkgfTsKKyAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZsb3dS ZWN0ID0gbGluZS5zY3JvbGxhYmxlT3ZlcmZsb3coKTsKIAogICAgICAgICBhdXRvIGFkanVzdE92 ZXJmbG93TG9naWNhbFdpZHRoV2l0aEJsb2NrRmxvd1F1aXJrID0gWyZdIHsKICAgICAgICAgICAg IGF1dG8mIHJvb3RTdHlsZSA9IG1fYmxvY2tGbG93LnN0eWxlKCk7CkBAIC0xMzcsNiArMTM3LDgg QEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6 SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gYm94 Q291bnQgPSBib3hJbmRleCAtIGZpcnN0Qm94SW5kZXg7CisgICAgICAgIGlmICghaW5saW5lQ29u dGVudC5oYXNWaXN1YWxPdmVyZmxvdygpICYmIGxpbmVJbmtPdmVyZmxvd1JlY3QgIT0gbGluZS5z Y3JvbGxhYmxlT3ZlcmZsb3coKSkKKyAgICAgICAgICAgIGlubGluZUNvbnRlbnQuc2V0SGFzVmlz dWFsT3ZlcmZsb3coKTsKICAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJz dEJveEluZGV4LCBib3hDb3VudCwgRmxvYXRSZWN0IHsgbGluZS5saW5lQm94UmVjdCgpIH0sIGxp bmUuZW5jbG9zaW5nVG9wQW5kQm90dG9tKCkudG9wLCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRv bSgpLmJvdHRvbSwgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwg bGluZS5iYXNlbGluZSgpLCBsaW5lLmJhc2VsaW5lVHlwZSgpLCBsaW5lLmNvbnRlbnRMb2dpY2Fs T2Zmc2V0KCksIGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpLCBsaW5lLmlzSG9yaXpvbnRhbCgp IH0pOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAKaW5kZXggYTI3MmE3YWZiNGFjNWU5ZTI5YWU1MDQ5ODg1YjdjZmE1NWRlMjVkZS4uMjE3 N2NiMjE3ZjgzYjk4ZjA5ZTg2ZTc5Yjk3ZDIyYzhmOWE0NmMxMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM2ODcsNiArMzY4NywxOCBAQCB2 b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0TW9kZXJuTGluZXMoYm9vbCByZWxheW91dENoaWxk cmVuLCBMYXlvdXRVbml0JiByZXBhaQogICAgIHJlcGFpbnRMb2dpY2FsVG9wID0gY29udGVudEJv eFRvcDsKICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KG9sZEJvcmRlckJveEJv dHRvbSwgbmV3Qm9yZGVyQm94Qm90dG9tKTsKIAorICAgIGF1dG8gaW5mbGF0ZVJlcGFpbnRUb3BB bmRCb3R0b21XaXRoSW5rT3ZlcmZsb3cgPSBbJl0geworICAgICAgICBhdXRvKiBpbmxpbmVDb250 ZW50ID0gbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmlubGluZUNvbnRlbnQoKTsK KyAgICAgICAgaWYgKCFpbmxpbmVDb250ZW50IHx8ICFpbmxpbmVDb250ZW50LT5oYXNWaXN1YWxP dmVyZmxvdygpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb3IgKGF1dG8mIGxpbmUg OiBpbmxpbmVDb250ZW50LT5saW5lcykgeworICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9 IExheW91dFJlY3QgeyBsaW5lLmlua092ZXJmbG93KCkgfTsKKyAgICAgICAgICAgIHJlcGFpbnRM b2dpY2FsVG9wID0gc3RkOjptaW4ocmVwYWludExvZ2ljYWxUb3AsIGlua092ZXJmbG93LnkoKSk7 CisgICAgICAgICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KHJlcGFpbnRMb2dp Y2FsQm90dG9tLCBpbmtPdmVyZmxvdy5tYXhZKCkpOworICAgICAgICB9CisgICAgfTsKKyAgICBp bmZsYXRlUmVwYWludFRvcEFuZEJvdHRvbVdpdGhJbmtPdmVyZmxvdygpOworCiAgICAgc2V0TG9n aWNhbEhlaWdodChuZXdCb3JkZXJCb3hCb3R0b20pOwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmNkY2Ux NmM2NTQzMmZiMzdkY2I1YjBmMjkxMTQ3YTUyZDFiZDg1Yy4uNTNjMjZjMDE0MjU1ZjE2ODUzZWUz MTAyNGJjNjI2NThhZGMzYzU3YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTA0LTA4ICBB bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChTYWZh cmkgMTUuNCk6IEZvY3VzZWQgZWxlbWVudCBkb2Vzbid0IHJlbmRlciBvdXRsaW5lIHdoZW4gaXQg aGFzIGFuIHVuZGVybGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM4OTk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MTQ4NDUxMj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvcmVwYWlu dC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9yZXBhaW50L2luY29ycmVjdC1vdXRsaW5lLXJlcGFpbnQuaHRtbDogQWRkZWQuCisK IDIwMjItMDQtMDggIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCBmb3IgYWNjZXNzaWJpbGl0eS9yb2xlcy10YWJsZS1hbmQtY2VsbC5odG1sIGlu IGlzb2xhdGVkIHRyZWUgbW9kZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvcmVwYWlu dC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvcmVwYWludC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50LWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi43MjA1YzNkMmU1MGRiMzViODBmMzg5YzlhMmVlMDNhYjhiYWMyNTNmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2luY29ycmVjdC1vdXRsaW5lLXJlcGFp bnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorb3V0bGluZQorUEFTUwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2luY29ycmVjdC1vdXRsaW5lLXJlcGFpbnQuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMzVmM2E1YjNkY2U0ODg1ZjEzMDc3YTViOGI4NTcxNTY1MzcwMDI5MQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9pbmNvcnJlY3Qtb3V0 bGluZS1yZXBhaW50Lmh0bWwKQEAgLTAsMCArMSwyNyBAQAorPHN0eWxlPgorc3BhbiB7CisgIGZv bnQtc2l6ZTogMTBweDsKKyAgZm9udC1mYW1pbHk6IEFoZW07Cit9Cis8L3N0eWxlPgorPCEtLSBQ QVNTIGlmIHRoZSBncmVlbiBvdXRsaW5lIGlzIHZpc2libGUgLS0+Cis8c3BhbiBpZD1jaGFuZ2VU aGlzPm91dGxpbmU8L3NwYW4+Cis8cHJlIGlkPXJlc3VsdD48L3ByZT4KKzxzY3JpcHQ+CitpZiAo d2luZG93LnRlc3RSdW5uZXIpIHsKKyAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgIHRlc3RS dW5uZXIud2FpdFVudGlsRG9uZSgpOworfQorc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgaWYg KHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICBpbnRlcm5hbHMuc3RhcnRUcmFja2luZ1JlcGFpbnRz KCk7CisgICAgY2hhbmdlVGhpcy5zdHlsZS5vdXRsaW5lID0gIjUwcHggc29saWQgZ3JlZW4iOwor ICAgIGxldCByZXBhaW50UmVjdHMgPSBpbnRlcm5hbHMucmVwYWludFJlY3RzQXNUZXh0KCk7Cisg ICAgaW50ZXJuYWxzLnN0b3BUcmFja2luZ1JlcGFpbnRzKCk7CisgICAgcmVzdWx0LnRleHRDb250 ZW50ID0gcmVwYWludFJlY3RzLmluZGV4T2YoJy0nKSA9PSAtMSA/ICJGQUlMOiA1MHB4IG91dGxp bmUgc2hvdWxkIHByb2R1Y2UgbmVnYXRpdmUgdmVydGljYWwgcG9zaXRpb24gZm9yIHJlcGFpbnQi IDogIlBBU1MiOworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgIHRlc3RSdW5uZXIu bm90aWZ5RG9uZSgpOworICB9IGVsc2UKKyAgICBjaGFuZ2VUaGlzLnN0eWxlLm91dGxpbmUgPSAi NTBweCBzb2xpZCBncmVlbiI7Cit9LCAwKTsKKzwvc2NyaXB0Pgo= 457160 2022-04-09 06:32:36 -0700 2022-04-09 10:56:31 -0700 Patch bug-238998-20220409063235.patch text/plain 16297 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1YzU0YTU0MmE3ZTFj ZTc0NzdhMDM2ZWQxMWZiMWM2NDNmMjMzNy4uMThlMTYwNjQ5MzlmMGZlZjQ3NTdjNGY0MGJmMTdi ODM1ZDQwMjg0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTA0LTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChTYWZhcmkg MTUuNCk6IEZvY3VzZWQgZWxlbWVudCBkb2Vzbid0IHJlbmRlciBvdXRsaW5lIHdoZW4gaXQgaGFz IGFuIHVuZGVybGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM4OTk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MTQ4NDUxMj4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGlsZSBvdXRsaW5lIGlz IHN1cHBvc2VkIHRvIGJlIHBhcnQgb2YgdGhlIGluayBvdmVyZmxvdygxKSwgV2ViS2l0IGhpc3Rv cmljYWxseSBoYXMgYmVlbgorICAgICAgICB0cmVhdGluZyBpdCBhcyBhIHNwZWNpYWwgIm5vbiBp bmsgb3ZlcmZsb3ciIHR5cGUgb2Ygb3ZlcmZsb3cuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBp biBwcmVwYXJhdGlvbiBmb3IgdHJhbnNpdGlvbmluZyB0aGUgb3V0bGluZSB0byByZWd1bGFyIGlu ayBvdmVyZmxvdy4KKworICAgICAgICBGaXJzdCB3ZSBzdGFydCB0cmVhdGluZyBvdXRsaW5lIGFz IHBhcnQgb2YgaW5rIG92ZXJmbG93IHdpdGhpbiBJRkMgYW5kCisgICAgICAgIGhhbmRsZSBpdCBh cyBzcGVjaWFsIHJlcGFpbnQgY29udGVudCBvbmx5IGF0IHRoZSBibG9jayAoUmVuZGVyQmxvY2tG bG93KSBsZXZlbC4KKworICAgICAgICBUZXN0OiBmYXN0L3JlcGFpbnQvaW5jb3JyZWN0LW91dGxp bmUtcmVwYWludC5odG1sCisKKyAgICAgICAgKDEpIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3Mt b3ZlcmZsb3ctMy8jaW5rCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OmNvbXB1dGVJbmtPdmVyZmxvd0ZvcklubGluZUxldmVsQm94KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBl bmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3gp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlG b3JEaXNwbGF5Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y29tcHV0ZUJveFNoYWRv d0lua092ZXJmbG93KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50OjpoYXNDb250ZW50IGNvbnN0KToKKyAgICAgICAg KiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudDo6aGFzVmlz dWFsT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OklubGluZUNvbnRlbnQ6OnNldEhhc1Zpc3VhbE92ZXJmbG93KToKKyAgICAgICAgKiBsYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6 OmNyZWF0ZURpc3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dE1v ZGVybkxpbmVzKTogVGhpcyBtYXkgY2F1c2Ugb3Zlcmx5IGluZmxhdGVkIHJlcGFpbnRUb3AvQm90 dG9tIHdoZW4KKyAgICAgICAgdGhlIGluayBvdmVyZmxvdyBpcyBub3Qgb3V0bGluZSBiYXNlZCAo dGV4dCBzdHJva2Ugb25seSBhdG0pIGJ1dCB3ZSB3aWxsIGFueXdheSB0cmlnZ2VyIAorICAgICAg ICBzaW1pbGFyIHJlcGFpbnQgcmVjdCBvbiB0aGF0IHBhcnQgbGF0ZXIgd2hlbiB3ZSBwcm9jZXNz IGluayBvdmVyZmxvdy4KKwogMjAyMi0wNC0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFRha2UgdG9wIGxheWVycyBpbnRvIGFjY291bnQgaW4gYWRkTGF5ZXJzL3Jl bW92ZUxheWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IDg3NTZlM2I2ZmU4MGUyMDBhNGUw YjljOGRkMWFmM2ZiYzdhM2M0ZjguLjE5NGZkN2FjMWFiOGUwMTEyOGMxZmNjZjA3YmM0ODg5OGY4 MGY5OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTEwNywxOSArMTA3LDM0IEBAIERpc3Bs YXlCb3hlcyBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQ29udGVudCYKICAgICByZXR1cm4gYm94ZXM7CiB9CiAKLXN0YXRpYyBpbmxpbmUg Ym9vbCBjb21wdXRlQm94U2hhZG93SW5rT3ZlcmZsb3coY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl LCBGbG9hdFJlY3QmIGlua092ZXJmbG93KQorc3RhdGljIGlubGluZSBib29sIGNvbXB1dGVJbmtP dmVyZmxvd0ZvcklubGluZUxldmVsQm94KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgRmxvYXRS ZWN0JiBpbmtPdmVyZmxvdykKIHsKLSAgICBhdXRvIHRvcEJveFNoYWRvdyA9IExheW91dFVuaXQg eyB9OwotICAgIGF1dG8gYm90dG9tQm94U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgc3R5 bGUuZ2V0Qm94U2hhZG93QmxvY2tEaXJlY3Rpb25FeHRlbnQodG9wQm94U2hhZG93LCBib3R0b21C b3hTaGFkb3cpOworICAgIGF1dG8gaGFzVmlzdWFsT3ZlcmZsb3cgPSBmYWxzZTsKIAotICAgIGF1 dG8gbGVmdEJveFNoYWRvdyA9IExheW91dFVuaXQgeyB9OwotICAgIGF1dG8gcmlnaHRCb3hTaGFk b3cgPSBMYXlvdXRVbml0IHsgfTsKLSAgICBzdHlsZS5nZXRCb3hTaGFkb3dJbmxpbmVEaXJlY3Rp b25FeHRlbnQobGVmdEJveFNoYWRvdywgcmlnaHRCb3hTaGFkb3cpOwotICAgIGlmICghdG9wQm94 U2hhZG93ICYmICFib3R0b21Cb3hTaGFkb3cgJiYgIWxlZnRCb3hTaGFkb3cgJiYgIXJpZ2h0Qm94 U2hhZG93KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaW5rT3ZlcmZsb3cuaW5mbGF0ZShs ZWZ0Qm94U2hhZG93LnRvRmxvYXQoKSwgdG9wQm94U2hhZG93LnRvRmxvYXQoKSwgcmlnaHRCb3hT aGFkb3cudG9GbG9hdCgpLCBib3R0b21Cb3hTaGFkb3cudG9GbG9hdCgpKTsKLSAgICByZXR1cm4g dHJ1ZTsKKyAgICBhdXRvIGluZmxhdGVXaXRoT3V0bGluZSA9IFsmXSB7CisgICAgICAgIGlmICgh c3R5bGUuaGFzT3V0bGluZUluVmlzdWFsT3ZlcmZsb3coKSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgaW5rT3ZlcmZsb3cuaW5mbGF0ZShzdHlsZS5vdXRsaW5lU2l6ZSgpKTsKKyAgICAg ICAgaGFzVmlzdWFsT3ZlcmZsb3cgPSB0cnVlOworICAgIH07CisgICAgaW5mbGF0ZVdpdGhPdXRs aW5lKCk7CisKKyAgICBhdXRvIGluZmxhdGVXaXRoQm94U2hhZG93ID0gWyZdIHsKKyAgICAgICAg YXV0byB0b3BCb3hTaGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgYXV0byBib3R0b21C b3hTaGFkb3cgPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgc3R5bGUuZ2V0Qm94U2hhZG93Qmxv Y2tEaXJlY3Rpb25FeHRlbnQodG9wQm94U2hhZG93LCBib3R0b21Cb3hTaGFkb3cpOworCisgICAg ICAgIGF1dG8gbGVmdEJveFNoYWRvdyA9IExheW91dFVuaXQgeyB9OworICAgICAgICBhdXRvIHJp Z2h0Qm94U2hhZG93ID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgIHN0eWxlLmdldEJveFNoYWRv d0lubGluZURpcmVjdGlvbkV4dGVudChsZWZ0Qm94U2hhZG93LCByaWdodEJveFNoYWRvdyk7Cisg ICAgICAgIGlmICghdG9wQm94U2hhZG93ICYmICFib3R0b21Cb3hTaGFkb3cgJiYgIWxlZnRCb3hT aGFkb3cgJiYgIXJpZ2h0Qm94U2hhZG93KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBp bmtPdmVyZmxvdy5pbmZsYXRlKGxlZnRCb3hTaGFkb3cudG9GbG9hdCgpLCB0b3BCb3hTaGFkb3cu dG9GbG9hdCgpLCByaWdodEJveFNoYWRvdy50b0Zsb2F0KCksIGJvdHRvbUJveFNoYWRvdy50b0Zs b2F0KCkpOworICAgICAgICBoYXNWaXN1YWxPdmVyZmxvdyA9IHRydWU7CisgICAgfTsKKyAgICBp bmZsYXRlV2l0aEJveFNoYWRvdygpOworCisgICAgcmV0dXJuIGhhc1Zpc3VhbE92ZXJmbG93Owog fQogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kVGV4dERpc3BsYXlC b3goY29uc3QgTGluZTo6UnVuJiBsaW5lUnVuLCBjb25zdCBJbmxpbmVSZWN0JiB0ZXh0UnVuUmVj dCwgRGlzcGxheUJveGVzJiBib3hlcykKQEAgLTIxMCw3ICsyMjUsNyBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kQXRvbWljSW5saW5lTGV2ZWxEaXNwbGF5Qm94KGNv bnN0IExpbmU6OgogICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVSdW4ubGF5b3V0Qm94KCk7CiAg ICAgYXV0byBpbmtPdmVyZmxvdyA9IFsmXSB7CiAgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBG bG9hdFJlY3QgeyBib3JkZXJCb3hSZWN0IH07Ci0gICAgICAgIGNvbXB1dGVCb3hTaGFkb3dJbmtP dmVyZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91 dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdyk7CisgICAgICAgIGNvbXB1dGVJbmtPdmVyZmxvd0Zv cklubGluZUxldmVsQm94KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgp IDogbGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KTsKICAgICAgICAgLy8gQXRvbWljIGlu bGluZSBib3ggY29udHJpYnV0ZSB0byB0aGVpciBpbmxpbmUgYm94IHBhcmVudHMgaW5rIG92ZXJm bG93IGF0IGFsbCB0aW1lcyAoZS5nLiA8c3Bhbj48aW1nPjwvc3Bhbj4pLgogICAgICAgICBtX2Nv bnRlbnRIYXNJbmtPdmVyZmxvdyA9IG1fY29udGVudEhhc0lua092ZXJmbG93IHx8ICZsYXlvdXRC b3gucGFyZW50KCkgIT0gJnJvb3QoKTsKICAgICAgICAgcmV0dXJuIGlua092ZXJmbG93OwpAQCAt MjYwLDcgKzI3NSw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJ bmxpbmVCb3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYgbGluCiAKICAgICBhdXRvIGlua092 ZXJmbG93ID0gWyZdIHsKICAgICAgICAgYXV0byBpbmtPdmVyZmxvdyA9IEZsb2F0UmVjdCB7IGlu bGluZUJveEJvcmRlckJveCB9OwotICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNv bXB1dGVCb3hTaGFkb3dJbmtPdmVyZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RM aW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50 SGFzSW5rT3ZlcmZsb3c7CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0 ZUlua092ZXJmbG93Rm9ySW5saW5lTGV2ZWxCb3goIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZp cnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpIHx8IG1fY29u dGVudEhhc0lua092ZXJmbG93OwogICAgICAgICByZXR1cm4gaW5rT3ZlcmZsb3c7CiAgICAgfTsK ICAgICBBU1NFUlQoaW5saW5lQm94LmlzSW5saW5lQm94KCkpOwpAQCAtMjg3LDcgKzMwMiw3IEBA IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRTcGFubmluZ0lubGluZUJv eERpc3BsYXlCb3goY29uc3QgTGluZTo6CiAgICAgYXV0byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5s YXlvdXRCb3goKTsKICAgICBhdXRvIGlua092ZXJmbG93ID0gWyZdIHsKICAgICAgICAgYXV0byBp bmtPdmVyZmxvdyA9IEZsb2F0UmVjdCB7IGlubGluZUJveEJvcmRlckJveCB9OwotICAgICAgICBt X2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVCb3hTaGFkb3dJbmtPdmVyZmxvdyghbV9s aW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgp LCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3c7CisgICAgICAgIG1fY29u dGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0ZUlua092ZXJmbG93Rm9ySW5saW5lTGV2ZWxCb3go IW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkgOiBsYXlvdXRCb3guc3R5 bGUoKSwgaW5rT3ZlcmZsb3cpIHx8IG1fY29udGVudEhhc0lua092ZXJmbG93OwogICAgICAgICBy ZXR1cm4gaW5rT3ZlcmZsb3c7CiAgICAgfTsKICAgICBBU1NFUlQoIWlubGluZUJveC5pc0ZpcnN0 Qm94KCkpOwpAQCAtNTMyLDcgKzU0Nyw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsCiAKICAg ICBhdXRvIGNvbXB1dGVJbmtPdmVyZmxvdyA9IFsmXSB7CiAgICAgICAgIGF1dG8gaW5rT3ZlcmZs b3cgPSBGbG9hdFJlY3QgeyBkaXNwbGF5Qm94LnZpc3VhbFJlY3RJZ25vcmluZ0Jsb2NrRGlyZWN0 aW9uKCkgfTsKLSAgICAgICAgbV9jb250ZW50SGFzSW5rT3ZlcmZsb3cgPSBjb21wdXRlQm94U2hh ZG93SW5rT3ZlcmZsb3coIW1fbGluZUluZGV4ID8gbGF5b3V0Qm94LmZpcnN0TGluZVN0eWxlKCkg OiBsYXlvdXRCb3guc3R5bGUoKSwgaW5rT3ZlcmZsb3cpIHx8IG1fY29udGVudEhhc0lua092ZXJm bG93OworICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVJbmtPdmVyZmxv d0ZvcklubGluZUxldmVsQm94KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHls ZSgpIDogbGF5b3V0Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8fCBtX2NvbnRlbnRIYXNJbmtP dmVyZmxvdzsKICAgICAgICAgZGlzcGxheUJveC5hZGp1c3RJbmtPdmVyZmxvdyhpbmtPdmVyZmxv dyk7CiAgICAgfTsKICAgICBjb21wdXRlSW5rT3ZlcmZsb3coKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uSW5saW5lQ29udGVudC5jcHAKaW5kZXggOTIxNDA5MTA5MTI4NWY4YzViZGFhZDhkNmU2ZDgw M2Q2NGIxZGM1NS4uNWQ0MzI1NjllYjQ0ODZhZjYxMTdmNmI0MTkyMzdmYjdhOGU1OThiOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uSW5saW5lQ29udGVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAg Ym9vbCBJbmxpbmVDb250ZW50OjpoYXNDb250ZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlQoYm94 ZXMuaXNFbXB0eSgpIHx8IGJveGVzWzBdLmlzUm9vdElubGluZUJveCgpKTsKICAgICByZXR1cm4g Ym94ZXMuc2l6ZSgpID4gMTsKLX07Cit9CiAKIEl0ZXJhdG9yUmFuZ2U8Y29uc3QgSW5saW5lRGlz cGxheTo6Qm94Kj4gSW5saW5lQ29udGVudDo6Ym94ZXNGb3JSZWN0KGNvbnN0IExheW91dFJlY3Qm IHJlY3QpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50LmgKaW5kZXgg NjQyY2Q1ZWE0MWE3OTc4N2U0MWNhZWU2YWRmYjA5MjZlZWU3M2NjYi4uNzlkZGI5N2U2OWYxOWI4 ZGE2YjZiMjhkNTdhMGYxNDRhNzVmNWY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNv bnRlbnQuaApAQCAtNjQsNiArNjQsOSBAQCBzdHJ1Y3QgSW5saW5lQ29udGVudCA6IHB1YmxpYyBS ZWZDb3VudGVkPElubGluZUNvbnRlbnQ+IHsKICAgICBib29sIGhhc011bHRpbGluZVBhaW50T3Zl cmxhcCB7IGZhbHNlIH07CiAKICAgICBib29sIGhhc0NvbnRlbnQoKSBjb25zdDsKKworICAgIGJv b2wgaGFzVmlzdWFsT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX2hhc1Zpc3VhbE92ZXJmbG93 OyB9CisgICAgdm9pZCBzZXRIYXNWaXN1YWxPdmVyZmxvdygpIHsgbV9oYXNWaXN1YWxPdmVyZmxv dyA9IHRydWU7IH0KICAgICAKICAgICBjb25zdCBMaW5lJiBsaW5lRm9yQm94KGNvbnN0IElubGlu ZURpc3BsYXk6OkJveCYgYm94KSBjb25zdCB7IHJldHVybiBsaW5lc1tib3gubGluZUluZGV4KCld OyB9CiAKQEAgLTk2LDYgKzk5LDcgQEAgcHJpdmF0ZToKIAogICAgIHVzaW5nIElubGluZUJveElu ZGV4Q2FjaGUgPSBIYXNoTWFwPENoZWNrZWRSZWY8Y29uc3QgTGF5b3V0OjpCb3g+LCBWZWN0b3I8 c2l6ZV90Pj47CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8SW5saW5lQm94SW5kZXhDYWNo ZT4gbV9pbmxpbmVCb3hJbmRleENhY2hlOworICAgIGJvb2wgbV9oYXNWaXN1YWxPdmVyZmxvdyB7 IGZhbHNlIH07CiB9OwogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdGlvbj4gdm9pZCBJbmxpbmVD b250ZW50Ojp0cmF2ZXJzZU5vblJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OkJveCYgbGF5 b3V0Qm94LCBGdW5jdGlvbiYmIGZ1bmN0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGQ3NzczY2RmOTM3ODI3Zjc5NThjZTE4MjVm NzdiOWM1MjA2NTQ0MjMuLjMzOGI0YThmNDQ0MGNjNzVmMmIzZTdjYmFhMGQ2Y2Y5ZmFmM2EyNmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAK QEAgLTkwLDcgKzkwLDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxh eUxpbmVzKExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICBpbmxpbmVDb250 ZW50LmxpbmVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobGluZXMuc2l6ZSgpKTsKICAgICBmb3Ig KHNpemVfdCBsaW5lSW5kZXggPSAwOyBsaW5lSW5kZXggPCBsaW5lcy5zaXplKCk7ICsrbGluZUlu ZGV4KSB7CiAgICAgICAgIGF1dG8mIGxpbmUgPSBsaW5lc1tsaW5lSW5kZXhdOwotICAgICAgICBh dXRvIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgPSBGbG9hdFJlY3QgeyBsaW5lLnNjcm9sbGFibGVP dmVyZmxvdygpIH07CisgICAgICAgIGF1dG8gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCA9IGxpbmUu c2Nyb2xsYWJsZU92ZXJmbG93KCk7CiAKICAgICAgICAgYXV0byBhZGp1c3RPdmVyZmxvd0xvZ2lj YWxXaWR0aFdpdGhCbG9ja0Zsb3dRdWlyayA9IFsmXSB7CiAgICAgICAgICAgICBhdXRvJiByb290 U3R5bGUgPSBtX2Jsb2NrRmxvdy5zdHlsZSgpOwpAQCAtMTM3LDYgKzEzNyw4IEBAIHZvaWQgSW5s aW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdTdGF0ZSYgaW5sCiAgICAgICAgIH0KIAogICAgICAgICBhdXRvIGJveENvdW50ID0gYm94 SW5kZXggLSBmaXJzdEJveEluZGV4OworICAgICAgICBpZiAoIWlubGluZUNvbnRlbnQuaGFzVmlz dWFsT3ZlcmZsb3coKSAmJiBsaW5lSW5rT3ZlcmZsb3dSZWN0ICE9IGxpbmUuc2Nyb2xsYWJsZU92 ZXJmbG93KCkpCisgICAgICAgICAgICBpbmxpbmVDb250ZW50LnNldEhhc1Zpc3VhbE92ZXJmbG93 KCk7CiAgICAgICAgIGlubGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RCb3hJbmRleCwg Ym94Q291bnQsIEZsb2F0UmVjdCB7IGxpbmUubGluZUJveFJlY3QoKSB9LCBsaW5lLmVuY2xvc2lu Z1RvcEFuZEJvdHRvbSgpLnRvcCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20s IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxp bmUoKSwgbGluZS5iYXNlbGluZVR5cGUoKSwgbGluZS5jb250ZW50TG9naWNhbE9mZnNldCgpLCBs aW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgbGluZS5pc0hvcml6b250YWwoKSB9KTsKICAgICB9 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4 IGEyNzJhN2FmYjRhYzVlOWUyOWFlNTA0OTg4NWI3Y2ZhNTVkZTI1ZGUuLjIxNzdjYjIxN2Y4M2I5 OGYwOWU4NmU3OWI5N2QyMmM4ZjlhNDZjMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0zNjg3LDYgKzM2ODcsMTggQEAgdm9pZCBSZW5kZXJC bG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0 VW5pdCYgcmVwYWkKICAgICByZXBhaW50TG9naWNhbFRvcCA9IGNvbnRlbnRCb3hUb3A7CiAgICAg cmVwYWludExvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChvbGRCb3JkZXJCb3hCb3R0b20sIG5ld0Jv cmRlckJveEJvdHRvbSk7CiAKKyAgICBhdXRvIGluZmxhdGVSZXBhaW50VG9wQW5kQm90dG9tV2l0 aElua092ZXJmbG93ID0gWyZdIHsKKyAgICAgICAgYXV0byogaW5saW5lQ29udGVudCA9IGxheW91 dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5pbmxpbmVDb250ZW50KCk7CisgICAgICAgIGlm ICghaW5saW5lQ29udGVudCB8fCAhaW5saW5lQ29udGVudC0+aGFzVmlzdWFsT3ZlcmZsb3coKSkK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZm9yIChhdXRvJiBsaW5lIDogaW5saW5lQ29u dGVudC0+bGluZXMpIHsKKyAgICAgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBMYXlvdXRSZWN0 IHsgbGluZS5pbmtPdmVyZmxvdygpIH07CisgICAgICAgICAgICByZXBhaW50TG9naWNhbFRvcCA9 IHN0ZDo6bWluKHJlcGFpbnRMb2dpY2FsVG9wLCBpbmtPdmVyZmxvdy55KCkpOworICAgICAgICAg ICAgcmVwYWludExvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChyZXBhaW50TG9naWNhbEJvdHRvbSwg aW5rT3ZlcmZsb3cubWF4WSgpKTsKKyAgICAgICAgfQorICAgIH07CisgICAgaW5mbGF0ZVJlcGFp bnRUb3BBbmRCb3R0b21XaXRoSW5rT3ZlcmZsb3coKTsKKwogICAgIHNldExvZ2ljYWxIZWlnaHQo bmV3Qm9yZGVyQm94Qm90dG9tKTsKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZjZGNlMTZjNjU0MzJmYjM3 ZGNiNWIwZjI5MTE0N2E1MmQxYmQ4NWMuLjFlYWMyNmZjYTZiMTRkNDAxNmNhYzZmNjQxYjZkNTI4 M2Y0Y2Y1OTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wNC0wOCAgQWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAoU2FmYXJpIDE1LjQpOiBG b2N1c2VkIGVsZW1lbnQgZG9lc24ndCByZW5kZXIgb3V0bGluZSB3aGVuIGl0IGhhcyBhbiB1bmRl cmxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz ODk5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTE0ODQ1MTI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3JlcGFpbnQvaW5jb3JyZWN0 LW91dGxpbmUtcmVwYWludC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVw YWludC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZh c3QvdGV4dC9zaW1wbGUtbGluZS1sYXlvdXQtdGV4dC1zdHJva2Utd2lkdGguaHRtbDogbm93IHdl IHByb2R1Y2UgYSBzbGlnaHRseSBkaWZmZXJlbnQgKG1vcmUgYWNjdXJhdGUpCisgICAgICAgIHZl cnRpY2FsIHJlcGFpbnQgcmFuZ2UuIEhvd2V2ZXIgdGhpcyB0ZXN0IGlzIGFib3V0IG1vdmluZyB0 aGUgY29udGVudCBob3Jpem9udGFsbHksIHNvIGxldCdzIG1ha2UgdGhpcworICAgICAgICB0ZXN0 IG1vcmUgcm9idXN0IGJ5IGZvY3VzaW5nIG9uIHRoZSBob3Jpem9udGFsIHBhcnQuIAorCiAyMDIy LTA0LTA4ICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggZm9yIGFjY2Vzc2liaWxpdHkvcm9sZXMtdGFibGUtYW5kLWNlbGwuaHRtbCBpbiBpc29s YXRlZCB0cmVlIG1vZGUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvaW5j b3JyZWN0LW91dGxpbmUtcmVwYWludC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3Jl cGFpbnQvaW5jb3JyZWN0LW91dGxpbmUtcmVwYWludC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NzIwNWMzZDJlNTBkYjM1YjgwZjM4OWM5YTJlZTAzYWI4YmFjMjUzZgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50LWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDIgQEAKK291dGxpbmUKK1BBU1MKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvcmVwYWludC9pbmNvcnJlY3Qtb3V0bGluZS1yZXBhaW50Lmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvaW5jb3JyZWN0LW91dGxpbmUtcmVwYWludC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjM1ZjNhNWIzZGNlNDg4NWYxMzA3N2E1YjhiODU3MTU2NTM3MDAyOTEKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvaW5jb3JyZWN0LW91dGxpbmUt cmVwYWludC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzxzdHlsZT4KK3NwYW4geworICBmb250LXNp emU6IDEwcHg7CisgIGZvbnQtZmFtaWx5OiBBaGVtOworfQorPC9zdHlsZT4KKzwhLS0gUEFTUyBp ZiB0aGUgZ3JlZW4gb3V0bGluZSBpcyB2aXNpYmxlIC0tPgorPHNwYW4gaWQ9Y2hhbmdlVGhpcz5v dXRsaW5lPC9zcGFuPgorPHByZSBpZD1yZXN1bHQ+PC9wcmU+Cis8c2NyaXB0PgoraWYgKHdpbmRv dy50ZXN0UnVubmVyKSB7CisgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICB0ZXN0UnVubmVy LndhaXRVbnRpbERvbmUoKTsKK30KK3NldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgIGlmICh3aW5k b3cuaW50ZXJuYWxzKSB7CisgICAgaW50ZXJuYWxzLnN0YXJ0VHJhY2tpbmdSZXBhaW50cygpOwor ICAgIGNoYW5nZVRoaXMuc3R5bGUub3V0bGluZSA9ICI1MHB4IHNvbGlkIGdyZWVuIjsKKyAgICBs ZXQgcmVwYWludFJlY3RzID0gaW50ZXJuYWxzLnJlcGFpbnRSZWN0c0FzVGV4dCgpOworICAgIGlu dGVybmFscy5zdG9wVHJhY2tpbmdSZXBhaW50cygpOworICAgIHJlc3VsdC50ZXh0Q29udGVudCA9 IHJlcGFpbnRSZWN0cy5pbmRleE9mKCctJykgPT0gLTEgPyAiRkFJTDogNTBweCBvdXRsaW5lIHNo b3VsZCBwcm9kdWNlIG5lZ2F0aXZlIHZlcnRpY2FsIHBvc2l0aW9uIGZvciByZXBhaW50IiA6ICJQ QVNTIjsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICB0ZXN0UnVubmVyLm5vdGlm eURvbmUoKTsKKyAgfSBlbHNlCisgICAgY2hhbmdlVGhpcy5zdHlsZS5vdXRsaW5lID0gIjUwcHgg c29saWQgZ3JlZW4iOworfSwgMCk7Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvdGV4dC9zaW1wbGUtbGluZS1sYXlvdXQtdGV4dC1zdHJva2Utd2lkdGgtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NpbXBsZS1saW5lLWxheW91dC10ZXh0LXN0cm9r ZS13aWR0aC1leHBlY3RlZC50eHQKaW5kZXggYzdmMjViOGI5NjAwODQxODFhYzY0NTAzYzI3MmQx NTA3ODcwMWJjYi4uMGQyNzVlMzBkNDliN2U2M2FlNmQyYWViMmNjNjMzOWYyMWY1NGYxNSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NpbXBsZS1saW5lLWxheW91dC10ZXh0LXN0 cm9rZS13aWR0aC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NpbXBs ZS1saW5lLWxheW91dC10ZXh0LXN0cm9rZS13aWR0aC1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw0 IEBACi1QQVNTIGludGVybmFscy5yZXBhaW50UmVjdHNBc1RleHQoKS5pbmRleE9mKCc5MCA4IDYy IDE4JykgaXMgbm90IC0xCitQQVNTIGludGVybmFscy5yZXBhaW50UmVjdHNBc1RleHQoKS5pbmRl eE9mKCc5MCcpIGlzIG5vdCAtMQogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBU RVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc2ltcGxlLWxp bmUtbGF5b3V0LXRleHQtc3Ryb2tlLXdpZHRoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQv c2ltcGxlLWxpbmUtbGF5b3V0LXRleHQtc3Ryb2tlLXdpZHRoLmh0bWwKaW5kZXggMGZkN2U1NzVh ZDlkOWZkZDg5YzAxNDZjN2EyMDA0Y2UzYTZkMDExNi4uMTQxYTI4ZDk3OTQ5NmEwOWUwZWNhZjNm MTMyMTMzNDI2ZTU0ZjEyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NpbXBs ZS1saW5lLWxheW91dC10ZXh0LXN0cm9rZS13aWR0aC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvdGV4dC9zaW1wbGUtbGluZS1sYXlvdXQtdGV4dC1zdHJva2Utd2lkdGguaHRtbApAQCAtMjIs NyArMjIsNyBAQAogCQlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZm9vIikuc3R5bGUubGVmdCA9 ICIxMDBweCI7CiAJCWRvY3VtZW50LmJvZHkub2Zmc2V0V2lkdGg7CiAJCWlmICh3aW5kb3cuaW50 ZXJuYWxzKSB7Ci0JCQlzaG91bGROb3RCZSgiaW50ZXJuYWxzLnJlcGFpbnRSZWN0c0FzVGV4dCgp LmluZGV4T2YoJzkwIDggNjIgMTgnKSIsICItMSIpOworCQkJc2hvdWxkTm90QmUoImludGVybmFs cy5yZXBhaW50UmVjdHNBc1RleHQoKS5pbmRleE9mKCc5MCcpIiwgIi0xIik7CiAJCQlpbnRlcm5h bHMuc3RvcFRyYWNraW5nUmVwYWludHMoKTsKIAkJCWZpbmlzaEpTVGVzdCgpOwogCQl9Cg==