218020 2020-10-21 06:50:41 -0700 Stop gap patch fix for regression in r267329. 2022-10-30 12:34:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=247239 InRadar P2 Normal --- 1 megan_gardner megan_gardner darin ews-watchlist mifenton sam webkit-bug-importer oldest_to_newest 1700163 0 megan_gardner 2020-10-21 06:50:41 -0700 Stop gap patch fix for regression in r267329. 1700164 1 411980 megan_gardner 2020-10-21 06:51:14 -0700 Created attachment 411980 Patch 1700291 2 412012 megan_gardner 2020-10-21 11:29:37 -0700 Created attachment 412012 Patch 1700299 3 412012 sam 2020-10-21 11:42:05 -0700 Comment on attachment 412012 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412012&action=review > Source/WebCore/ChangeLog:7 > + What was the regression? How does this fix it? Where is the long term solution being tracked? 1700326 4 412017 megan_gardner 2020-10-21 12:45:19 -0700 Created attachment 412017 Patch 1700329 5 412019 megan_gardner 2020-10-21 12:53:30 -0700 Created attachment 412019 Patch 1700332 6 412019 darin 2020-10-21 12:56:54 -0700 Comment on attachment 412019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412019&action=review Looks good. I really appreciate having the test, which I will keep working and/or refine as I return to the Selection API work. > Source/WebCore/editing/VisibleSelection.cpp:390 > - bool shouldUpdateAnchor = m_start != startBeforeAdjustments; > - bool shouldUpdateFocus = m_end != endBeforeAdjustments; > + bool shouldUpdateAnchor = false; > + bool shouldUpdateFocus = false; Might be good to leave a comment behind here. The fact that these are always false makes the code peculiar for now, but makes sense if you know we intend to change it later. 1700407 7 412033 megan_gardner 2020-10-21 14:56:57 -0700 Created attachment 412033 Patch 1700438 8 412039 megan_gardner 2020-10-21 15:54:26 -0700 Created attachment 412039 Patch 1700444 9 412039 darin 2020-10-21 16:04:39 -0700 Comment on attachment 412039 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412039&action=review > Source/WebCore/editing/VisibleSelection.cpp:389 > + bool shouldUpdateAnchor = false; // Set to false because of <rdar://problem/69542459>. Can be returned to original logic when this problem is fully fixed. Probably more kind to open source contributors to cite https://bugs.webkit.org/show_bug.cgi?id=218020 instead of rdar, but clear enough either way. I promise to remove this comment some day either way. 1700490 10 ews-feeder 2020-10-21 17:41:01 -0700 Committed r268847: <https://trac.webkit.org/changeset/268847> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412039. 1700491 11 webkit-bug-importer 2020-10-21 17:41:18 -0700 <rdar://problem/70553518> 1715788 12 darin 2020-12-18 12:38:46 -0800 Seems like the test isn’t working well to detect the problem. I rolled the change back and the test still passes! 1715789 13 darin 2020-12-18 12:41:39 -0800 No, I was running the test wrong. I was confused by the ChangeLog, which lists the wrong directory for the test. 411980 2020-10-21 06:51:14 -0700 2020-10-21 11:29:35 -0700 Patch bug-218020-20201021065113.patch text/plain 7819 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uNTNkOGMxMWVlNzExNzhlNzA5ZTJmNWVjZTUzZjAy MmI2NzcwZjQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL3NlbGVjdGlvbi9kb3Vi bGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwKKworICAgICAgICAq IGVkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNpYmxl U2VsZWN0aW9uOjp2YWxpZGF0ZSk6CisKIDIwMjAtMTAtMjAgIEFudG9pbmUgUXVpbnQgIDxncmFv dXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODQ4Myk6IE1hcCBqdW1w cyBhcm91bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20sIHN0cmF2YS5jb20KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCmluZGV4IDNhMjM5Mzk1MmRkYzll YzdjYzVlZjM4ODk0YzU0OWNmZWM2MzllNDIuLmMwZjBhMTI2NTNhYTA2NzgyMjI5OTE0MmZlMmFj NTliNTZlZDA1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNl bGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9u LmNwcApAQCAtMzg2LDggKzM4Niw4IEBAIHZvaWQgVmlzaWJsZVNlbGVjdGlvbjo6dmFsaWRhdGUo VGV4dEdyYW51bGFyaXR5IGdyYW51bGFyaXR5KQogICAgIGFkanVzdFNlbGVjdGlvblRvQXZvaWRD cm9zc2luZ0VkaXRpbmdCb3VuZGFyaWVzKCk7CiAgICAgdXBkYXRlU2VsZWN0aW9uVHlwZSgpOwog Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBtX3N0YXJ0ICE9IHN0YXJ0QmVmb3JlQWRq dXN0bWVudHM7Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVGb2N1cyA9IG1fZW5kICE9IGVuZEJlZm9y ZUFkanVzdG1lbnRzOworICAgIGJvb2wgc2hvdWxkVXBkYXRlQW5jaG9yID0gZmFsc2U7CisgICAg Ym9vbCBzaG91bGRVcGRhdGVGb2N1cyA9IGZhbHNlOwogCiAgICAgaWYgKGlzUmFuZ2UoKSkgewog ICAgICAgICAvLyAiQ29uc3RyYWluIiB0aGUgc2VsZWN0aW9uIHRvIGJlIHRoZSBzbWFsbGVzdCBl cXVpdmFsZW50IHJhbmdlIG9mIG5vZGVzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFlZWI4YzYzZjMyNTgwYmQzYjYwYmYx MTI4NzgxNzM3MWNhYzg5MzguLmRiMTIzYmM1MTJjN2NjNjgyZmMwYjk3ODkwYTc1YWE2MmE5NjNm NzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0xMC0yMSAgTWVnYW4gR2FyZG5lciAgPG1l Z2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3AgZ2FwIHBhdGNoIGZpeCBmb3Ig cmVncmVzc2lvbiBpbiByMjY3MzI5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE4MDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWct b3Zlci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZWRp dGluZy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVj dC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAg ICAod2luZG93LlVJSGVscGVyLmRvdWJsZUNsaWNrQXRNb3VzZURvd24pOgorICAgICAgICAod2lu ZG93LlVJSGVscGVyLm1vdXNlVXApOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmRyYWdNb3Vz ZUFjcm9zc0VsZW1lbnQpOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmRvdWJsZUNsaWNrRWxl bWVudE1vdXNlRG93bik6CisKIDIwMjAtMTAtMjAgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODQ4Myk6IE1hcCBqdW1wcyBhcm91 bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20sIHN0cmF2YS5jb20KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFu Y2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rp b24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMDUzNTk2NThiNTU2NjRjN2U1NGE3NDkzOWU4MWJhYzExOGJiYzhlYQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZS1j bGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsNTYgQEAKKworQmVmb3JlIGV4dGVuZGluZyB0aGUgc2VsZWN0aW9uOgorfCAiCisgICAgIgor fCA8cD4KK3wgICAiVGhlICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJlbmQiCit8ICAgICAicXVp Y2siCit8ICAgIiAiCit8ICAgPHNwYW4+Cit8ICAgICBpZD0ibWlkZGxlMyIKK3wgICAgICJicm93 biIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUyIgorfCAgICAgImZveCIK K3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUxIgorfCAgICAgImp1bXBlZCIK K3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJzdGFydCIKK3wgICAgICJvdmVyIgorfCAg ICIgdGhlIGxhenkgZG9nLiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS4iCit8 ICIKKyIKKworcXVpY2sgYnJvd24gZm94IGp1bXBlZCBvdmVyOgorfCAiCisgICAgIgorfCA8cD4K K3wgICAiVGhlICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJlbmQiCit8ICAgICAiPCNzZWxlY3Rp b24tZm9jdXM+cXVpY2siCit8ICAgIiAiCit8ICAgPHNwYW4+Cit8ICAgICBpZD0ibWlkZGxlMyIK K3wgICAgICJicm93biIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUyIgor fCAgICAgImZveCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUxIgorfCAg ICAgImp1bXBlZCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJzdGFydCIKK3wgICAg ICJvdmVyPCNzZWxlY3Rpb24tYW5jaG9yPiIKK3wgICAiIHRoZSBsYXp5IGRvZy4gQW5kIHRoZW4g dGhlcmUgd2FzIGFub3RoZXIgc2VudGVuY2UuIgorfCAiCisiCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3It dG8tc2VsZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xp Y2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2ZhNjJh ZjQzZDMyYzk2MWU4MmEzZWJhZmFjOGM2ZmU2NTg1Njk3NQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFu Y2hvci10by1zZWxlY3QuaHRtbApAQCAtMCwwICsxLDUyIEBACis8IURPQ1RZUEUgaHRtbD4gPCEt LSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxo dG1sPgorPGhlYWQ+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNl LXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9k dW1wLWFzLW1hcmt1cC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2Vz L3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CitwIHsKKyAgICBmb250LXNpemU6IDIw cHg7Cit9CisKK3AgKyBwIHsKKyAgICBtYXJnaW4tdG9wOiAxMDBweDsKK30KKworI3N0YXJ0IHsK KyAgICBib3JkZXI6IDFweCBzb2xpZCBibHVlOworfQorCisjZW5kIHsKKyAgICBwYWRkaW5nLXJp Z2h0OiAycHg7CisgICAgYm9yZGVyOiAxcHggc29saWQgdG9tYXRvOworfQorPC9zdHlsZT4KKzwv aGVhZD4KKzxib2R5PgorPGRpdj5UaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCBzaGlmdC1jbGlja2lu ZyB0byBleHRlbmQgYW4gZXhpc3RpbmcgdGV4dCBzZWxlY3Rpb24gZG9lcyBub3QgdW5zZWxlY3Qg dGhlIGN1cnJlbnRseSBzZWxlY3RlZCB0ZXh0LiBUbyB0ZXN0IG1hbnVhbGx5LCBsb2FkIHRoZSBw YWdlIGFuZCBzaGlmdC1jbGljayB0aGUgY2FwaXRhbCBsZXR0ZXIgVCBvbiB0aGUgc2Vjb25kIGxp bmUuIFRoZSB0ZXh0ICdsYXp5IGRvZy4gVCcgc2hvdWxkIGJlIHNlbGVjdGVkLjwvZGl2PgorPGRp diBpZD0iY29udGFpbmVyIj4KKyAgICA8cD5UaGUgPHNwYW4gaWQ9ImVuZCI+cXVpY2s8L3NwYW4+ IDxzcGFuIGlkPSJtaWRkbGUzIj5icm93bjwvc3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTIiPmZveDwv c3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTEiPmp1bXBlZDwvc3Bhbj4gPHNwYW4gaWQ9InN0YXJ0Ij5v dmVyPC9zcGFuPiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVuIHRoZXJlIHdhcyBhbm90aGVyIHNlbnRl bmNlLjwvcD4KKzwvZGl2PgorPHNjcmlwdD4KKworKGFzeW5jIGZ1bmN0aW9uICgpIHsKKyAgICBp ZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICByZXR1cm47CisKKyAgICBpbnRlcm5hbHMu c2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJNYWMiKTsKKyAgICBNYXJrdXAuZHVtcChkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFpbmVyIiksICJCZWZvcmUgZXh0ZW5kaW5nIHRoZSBz ZWxlY3Rpb24iKTsKKworICAgIFVJSGVscGVyLmRvdWJsZUNsaWNrRWxlbWVudE1vdXNlRG93bihk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3RhcnQiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNl QWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWlkZGxlMSIpKTsKKyAgICBV SUhlbHBlci5kcmFnTW91c2VBY3Jvc3NFbGVtZW50KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJt aWRkbGUyIikpOworICAgIFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm1pZGRsZTMiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3Nz RWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZW5kIikpOworICAgIFVJSGVscGVyLm1v dXNlVXAoKTsKKworICAgIE1hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250 YWluZXIiKSwgZG9jdW1lbnQuZ2V0U2VsZWN0aW9uKCkudG9TdHJpbmcoKSk7CisgICAgTWFya3Vw Lm5vdGlmeURvbmUoKTsKK30pKCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMv dWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwppbmRleCAy NTQ5M2VjYjhkMzMxMGUxZDliNzZlNDAwZTNjOGZmNzMxZmYyNThhLi42OWYwMjg2NTIyYjI3MGMy ZDU2M2NjOTliZjU1NmFhZTdjOWFkMjNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9yZXNvdXJj ZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMK QEAgLTE5LDYgKzE5LDE5IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwogICAgIH0KIAorICAgIHN0YXRpYyBkb3VibGVD bGlja0F0TW91c2VEb3duKHgxLCB5MSkKKyAgICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl TW92ZVRvKHgxLCB5MSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAg ICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigp OworICAgIH0KKworICAgIHN0YXRpYyBtb3VzZVVwKCkKKyAgICB7CisgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlVXAoKTsKKyAgICB9CisKICAgICBzdGF0aWMgZG91YmxlQ2xpY2tBdFRoZW5EcmFn VG8oeDEsIHkxLCB4MiwgeTIpCiAgICAgewogICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVU byh4MSwgeTEpOwpAQCAtMjksNiArNDIsMjggQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlI ZWxwZXIgewogICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CiAgICAgfQogCisgICAgc3Rh dGljIGRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZWxlbWVudCkKKyAgICB7CisgICAgICAgIGNvbnN0 IHgxID0gZWxlbWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aDsKKyAgICAgICAg Y29uc3QgeDIgPSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoICogLjc1 OworICAgICAgICBjb25zdCB4MyA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0 V2lkdGggLyAyOworICAgICAgICBjb25zdCB4NCA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1l bnQub2Zmc2V0V2lkdGggLyA0OworICAgICAgICBjb25zdCB4NSA9IGVsZW1lbnQub2Zmc2V0TGVm dDsKKyAgICAgICAgY29uc3QgeSA9IGVsZW1lbnQub2Zmc2V0VG9wICsgZWxlbWVudC5vZmZzZXRI ZWlnaHQgLyAyOworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeSk7CisgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgyLCB5KTsKKyAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VNb3ZlVG8oeDMsIHkpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4NCwg eSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHg1LCB5KTsKKyAgICB9CisKKyAg ICBzdGF0aWMgZG91YmxlQ2xpY2tFbGVtZW50TW91c2VEb3duKGVsZW1lbnQxKQorICAgIHsKKyAg ICAgICAgY29uc3QgeDEgPSBlbGVtZW50MS5vZmZzZXRMZWZ0ICsgZWxlbWVudDEub2Zmc2V0V2lk dGggLyAyOworICAgICAgICBjb25zdCB5MSA9IGVsZW1lbnQxLm9mZnNldFRvcCArIGVsZW1lbnQx Lm9mZnNldEhlaWdodCAvIDI7CisgICAgICAgIHJldHVybiBVSUhlbHBlci5kb3VibGVDbGlja0F0 TW91c2VEb3duKHgxLCB5MSk7CisgICAgfQorCiAgICAgc3RhdGljIGFzeW5jIG1vdmVNb3VzZUFu ZFdhaXRGb3JGcmFtZSh4LCB5KQogICAgIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8oeCwgeSk7Cg== 412012 2020-10-21 11:29:37 -0700 2020-10-21 12:45:18 -0700 Patch bug-218020-20201021112936.patch text/plain 8072 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uNTNkOGMxMWVlNzExNzhlNzA5ZTJmNWVjZTUzZjAy MmI2NzcwZjQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL3NlbGVjdGlvbi9kb3Vi bGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwKKworICAgICAgICAq IGVkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaXNpYmxl U2VsZWN0aW9uOjp2YWxpZGF0ZSk6CisKIDIwMjAtMTAtMjAgIEFudG9pbmUgUXVpbnQgIDxncmFv dXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODQ4Myk6IE1hcCBqdW1w cyBhcm91bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20sIHN0cmF2YS5jb20KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3BwCmluZGV4IDNhMjM5Mzk1MmRkYzll YzdjYzVlZjM4ODk0YzU0OWNmZWM2MzllNDIuLmMwZjBhMTI2NTNhYTA2NzgyMjI5OTE0MmZlMmFj NTliNTZlZDA1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNl bGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9u LmNwcApAQCAtMzg2LDggKzM4Niw4IEBAIHZvaWQgVmlzaWJsZVNlbGVjdGlvbjo6dmFsaWRhdGUo VGV4dEdyYW51bGFyaXR5IGdyYW51bGFyaXR5KQogICAgIGFkanVzdFNlbGVjdGlvblRvQXZvaWRD cm9zc2luZ0VkaXRpbmdCb3VuZGFyaWVzKCk7CiAgICAgdXBkYXRlU2VsZWN0aW9uVHlwZSgpOwog Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBtX3N0YXJ0ICE9IHN0YXJ0QmVmb3JlQWRq dXN0bWVudHM7Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVGb2N1cyA9IG1fZW5kICE9IGVuZEJlZm9y ZUFkanVzdG1lbnRzOworICAgIGJvb2wgc2hvdWxkVXBkYXRlQW5jaG9yID0gZmFsc2U7CisgICAg Ym9vbCBzaG91bGRVcGRhdGVGb2N1cyA9IGZhbHNlOwogCiAgICAgaWYgKGlzUmFuZ2UoKSkgewog ICAgICAgICAvLyAiQ29uc3RyYWluIiB0aGUgc2VsZWN0aW9uIHRvIGJlIHRoZSBzbWFsbGVzdCBl cXVpdmFsZW50IHJhbmdlIG9mIG5vZGVzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFlZWI4YzYzZjMyNTgwYmQzYjYwYmYx MTI4NzgxNzM3MWNhYzg5MzguLmRiMTIzYmM1MTJjN2NjNjgyZmMwYjk3ODkwYTc1YWE2MmE5NjNm NzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0xMC0yMSAgTWVnYW4gR2FyZG5lciAgPG1l Z2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3AgZ2FwIHBhdGNoIGZpeCBmb3Ig cmVncmVzc2lvbiBpbiByMjY3MzI5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE4MDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWct b3Zlci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZWRp dGluZy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVj dC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAg ICAod2luZG93LlVJSGVscGVyLmRvdWJsZUNsaWNrQXRNb3VzZURvd24pOgorICAgICAgICAod2lu ZG93LlVJSGVscGVyLm1vdXNlVXApOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmRyYWdNb3Vz ZUFjcm9zc0VsZW1lbnQpOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmRvdWJsZUNsaWNrRWxl bWVudE1vdXNlRG93bik6CisKIDIwMjAtMTAtMjAgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODQ4Myk6IE1hcCBqdW1wcyBhcm91 bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20sIHN0cmF2YS5jb20KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zl ci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvbWFj L3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0LWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNTM1OTY1OGI1NTY2NGM3ZTU0YTc0OTM5ZTgxYmFjMTE4 YmJjOGVhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0 aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNTYgQEAKKworQmVmb3JlIGV4dGVuZGluZyB0aGUgc2VsZWN0aW9uOgor fCAiCisgICAgIgorfCA8cD4KK3wgICAiVGhlICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJlbmQi Cit8ICAgICAicXVpY2siCit8ICAgIiAiCit8ICAgPHNwYW4+Cit8ICAgICBpZD0ibWlkZGxlMyIK K3wgICAgICJicm93biIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUyIgor fCAgICAgImZveCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUxIgorfCAg ICAgImp1bXBlZCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJzdGFydCIKK3wgICAg ICJvdmVyIgorfCAgICIgdGhlIGxhenkgZG9nLiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBz ZW50ZW5jZS4iCit8ICIKKyIKKworcXVpY2sgYnJvd24gZm94IGp1bXBlZCBvdmVyOgorfCAiCisg ICAgIgorfCA8cD4KK3wgICAiVGhlICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJlbmQiCit8ICAg ICAiPCNzZWxlY3Rpb24tZm9jdXM+cXVpY2siCit8ICAgIiAiCit8ICAgPHNwYW4+Cit8ICAgICBp ZD0ibWlkZGxlMyIKK3wgICAgICJicm93biIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlk PSJtaWRkbGUyIgorfCAgICAgImZveCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJt aWRkbGUxIgorfCAgICAgImp1bXBlZCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJz dGFydCIKK3wgICAgICJvdmVyPCNzZWxlY3Rpb24tYW5jaG9yPiIKK3wgICAiIHRoZSBsYXp5IGRv Zy4gQW5kIHRoZW4gdGhlcmUgd2FzIGFub3RoZXIgc2VudGVuY2UuIgorfCAiCisiCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1k cmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMv c2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5kZDg3NDMxZTRmNmI4YmUwZjFmNTEzOTg3MTk5Mzc1MzAwZmUxNmNlCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJs ZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QuaHRtbApAQCAtMCwwICsxLDUy IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJs ZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBuYW1lPSJ2aWV3cG9y dCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPgorPHNjcmlw dCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+ CitwIHsKKyAgICBmb250LXNpemU6IDIwcHg7Cit9CisKK3AgKyBwIHsKKyAgICBtYXJnaW4tdG9w OiAxMDBweDsKK30KKworI3N0YXJ0IHsKKyAgICBib3JkZXI6IDFweCBzb2xpZCBibHVlOworfQor CisjZW5kIHsKKyAgICBwYWRkaW5nLXJpZ2h0OiAycHg7CisgICAgYm9yZGVyOiAxcHggc29saWQg dG9tYXRvOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj5UaGlzIHRlc3QgdmVy aWZpZXMgdGhhdCBkb3VibGUtY2xpY2tpbmcgYW5kIHRoZW4gZHJhZ2dpbmcgb3ZlciB0aGUgc2Vs ZWN0aW9uIGFuY2hvciBwb2ludCAoaW4gTFRSIGxhbmd1YWdlcywgdGhpcyBpcyBkcmFnZ2luZyBs ZWZ0KSB0byBleHRlbmQgdGhlIHRleHQgc2VsZWN0aW9uIGRvZXMgbm90IGV4dGVuZCB0aGUgc2Vs ZWN0aW9uIGZyb20gdGhlIG9yaWdpbmFsIHNlbGVjdGlvbiBmb2N1cyBhcyB3ZWxsIChpbiBMUlQg bGFuZ3VhZ2VzLCB0aGUgc2VsZWN0aW9uIHNob3VsZCBub3QgZXh0ZW50IHRvIHRoZSByaWdodCBh cyB3ZWxsIHdoaWxlIGRyYWdnaW5nIGxlZnQpLiBUbyB0ZXN0IG1hbnVhbGx5LCBsb2FkIHRoZSBw YWdlIGFuZCBkb3VibGUgY2xpY2sgb24gJ292ZXInIGFuZCBkcmFnIHRvICdxdWljaycuIFRoZSB0 ZXh0ICdxdWljayBicm93biBmb3gganVtcGVkIG92ZXInIHNob3VsZCBiZSBzZWxlY3RlZCwgYW5k IG5vdGhpbmcgZWxzZS48L2Rpdj4KKzxkaXYgaWQ9ImNvbnRhaW5lciI+CisgICAgPHA+VGhlIDxz cGFuIGlkPSJlbmQiPnF1aWNrPC9zcGFuPiA8c3BhbiBpZD0ibWlkZGxlMyI+YnJvd248L3NwYW4+ IDxzcGFuIGlkPSJtaWRkbGUyIj5mb3g8L3NwYW4+IDxzcGFuIGlkPSJtaWRkbGUxIj5qdW1wZWQ8 L3NwYW4+IDxzcGFuIGlkPSJzdGFydCI+b3Zlcjwvc3Bhbj4gdGhlIGxhenkgZG9nLiBBbmQgdGhl biB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS48L3A+Cis8L2Rpdj4KKzxzY3JpcHQ+CisKKyhh c3luYyBmdW5jdGlvbiAoKSB7CisgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAg cmV0dXJuOworCisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEVkaXRpbmdCZWhhdmlvcigiTWFj Iik7CisgICAgTWFya3VwLmR1bXAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRhaW5lciIp LCAiQmVmb3JlIGV4dGVuZGluZyB0aGUgc2VsZWN0aW9uIik7CisKKyAgICBVSUhlbHBlci5kb3Vi bGVDbGlja0VsZW1lbnRNb3VzZURvd24oZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN0YXJ0Iikp OworICAgIFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoIm1pZGRsZTEiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWlkZGxlMiIpKTsKKyAgICBVSUhlbHBlci5kcmFnTW91 c2VBY3Jvc3NFbGVtZW50KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtaWRkbGUzIikpOworICAg IFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImVuZCIpKTsKKyAgICBVSUhlbHBlci5tb3VzZVVwKCk7CisKKyAgICBNYXJrdXAuZHVtcChkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFpbmVyIiksIGRvY3VtZW50LmdldFNlbGVjdGlvbigp LnRvU3RyaW5nKCkpOworICAgIE1hcmt1cC5ub3RpZnlEb25lKCk7Cit9KSgpOworPC9zY3JpcHQ+ Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcyBiL0xheW91dFRlc3RzL3Jlc291 cmNlcy91aS1oZWxwZXIuanMKaW5kZXggMjU0OTNlY2I4ZDMzMTBlMWQ5Yjc2ZTQwMGUzYzhmZjcz MWZmMjU4YS4uNjlmMDI4NjUyMmIyNzBjMmQ1NjNjYzk5YmY1NTZhYWU3YzlhZDIzZCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcworKysgYi9MYXlvdXRUZXN0 cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCkBAIC0xOSw2ICsxOSwxOSBAQCB3aW5kb3cuVUlIZWxw ZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKICAg ICB9CiAKKyAgICBzdGF0aWMgZG91YmxlQ2xpY2tBdE1vdXNlRG93bih4MSwgeTEpCisgICAgewor ICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeTEpOworICAgICAgICBldmVudFNl bmRlci5tb3VzZURvd24oKTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworICAgICAg ICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICB9CisKKyAgICBzdGF0aWMgbW91c2VVcCgp CisgICAgeworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgfQorCiAgICAgc3Rh dGljIGRvdWJsZUNsaWNrQXRUaGVuRHJhZ1RvKHgxLCB5MSwgeDIsIHkyKQogICAgIHsKICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDEsIHkxKTsKQEAgLTI5LDYgKzQyLDI4IEBAIHdp bmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91 c2VVcCgpOwogICAgIH0KIAorICAgIHN0YXRpYyBkcmFnTW91c2VBY3Jvc3NFbGVtZW50KGVsZW1l bnQpCisgICAgeworICAgICAgICBjb25zdCB4MSA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1l bnQub2Zmc2V0V2lkdGg7CisgICAgICAgIGNvbnN0IHgyID0gZWxlbWVudC5vZmZzZXRMZWZ0ICsg ZWxlbWVudC5vZmZzZXRXaWR0aCAqIC43NTsKKyAgICAgICAgY29uc3QgeDMgPSBlbGVtZW50Lm9m ZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gMjsKKyAgICAgICAgY29uc3QgeDQgPSBl bGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gNDsKKyAgICAgICAgY29u c3QgeDUgPSBlbGVtZW50Lm9mZnNldExlZnQ7CisgICAgICAgIGNvbnN0IHkgPSBlbGVtZW50Lm9m ZnNldFRvcCArIGVsZW1lbnQub2Zmc2V0SGVpZ2h0IC8gMjsKKyAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VNb3ZlVG8oeDEsIHkpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4Miwg eSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgzLCB5KTsKKyAgICAgICAgZXZl bnRTZW5kZXIubW91c2VNb3ZlVG8oeDQsIHkpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyh4NSwgeSk7CisgICAgfQorCisgICAgc3RhdGljIGRvdWJsZUNsaWNrRWxlbWVudE1vdXNl RG93bihlbGVtZW50MSkKKyAgICB7CisgICAgICAgIGNvbnN0IHgxID0gZWxlbWVudDEub2Zmc2V0 TGVmdCArIGVsZW1lbnQxLm9mZnNldFdpZHRoIC8gMjsKKyAgICAgICAgY29uc3QgeTEgPSBlbGVt ZW50MS5vZmZzZXRUb3AgKyBlbGVtZW50MS5vZmZzZXRIZWlnaHQgLyAyOworICAgICAgICByZXR1 cm4gVUlIZWxwZXIuZG91YmxlQ2xpY2tBdE1vdXNlRG93bih4MSwgeTEpOworICAgIH0KKwogICAg IHN0YXRpYyBhc3luYyBtb3ZlTW91c2VBbmRXYWl0Rm9yRnJhbWUoeCwgeSkKICAgICB7CiAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwo= 412017 2020-10-21 12:45:19 -0700 2020-10-21 12:53:28 -0700 Patch bug-218020-20201021124518.patch text/plain 8549 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uNjNlMGI3M2JiYzJmYzUwZjZiZTU0MDY1ZmI1ZWI5 MmFjNzgxZjhkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcmVmYWN0b3JpbmcgaW4gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjczOSBjYXVzZWQgc2VsZWN0aW9ucyB0 byAKKyAgICAgICAgZXhwYW5kIGluIGJvdGggZGlyZWN0aW9ucyBhZnRlciBhIGRvdWJsZS1jbGlj ayBhbmQgZHJhZyB0byBleHBhbmQgb24gbWFjLiBUaGlzIGJlaGF2aW9yCisgICAgICAgIHdhcyBu b3Qgb2JzZXJ2ZWQgb24gaU9TLiBUaGlzIHJlbW92ZXMgdGhlIGVycm9yLXByb25lIGNhbGN1bGF0 aW9uLiAKKyAgICAgICAgTm90ZSB0aGF0IHRoaXMgYnVnIGRvZXMgbm90IG9jY3VyIGlmIG9ubHkg dGVzdGluZyBpbW1lZGlhdGx5IG1vdmluZyB0aGUgZHJhZyBwb2ludCB0byB0aGUKKyAgICAgICAg ZW5kIG9mIHRoZSBzZWxlY3Rpb24uIERyYWdnaW5nIGFjcm9zcyBhbGwgdGhlIHdvcmRzIGFzIGEg cmVhbCB1c2VyIHdvdWxkIG5lZWRzIHRvIGJlIGVtdWxhdGVkLiAKKworICAgICAgICBUZXN0OiBl ZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2Vs ZWN0Lmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWaXNpYmxlU2VsZWN0aW9uOjp2YWxpZGF0ZSk6CisKIDIwMjAtMTAtMjAg IEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lP TiAocjI2ODQ4Myk6IE1hcCBqdW1wcyBhcm91bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20s IHN0cmF2YS5jb20KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNl bGVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24uY3Bw CmluZGV4IDNhMjM5Mzk1MmRkYzllYzdjYzVlZjM4ODk0YzU0OWNmZWM2MzllNDIuLmMwZjBhMTI2 NTNhYTA2NzgyMjI5OTE0MmZlMmFjNTliNTZlZDA1YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRp dGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcApAQCAtMzg2LDggKzM4Niw4IEBAIHZvaWQgVmlzaWJs ZVNlbGVjdGlvbjo6dmFsaWRhdGUoVGV4dEdyYW51bGFyaXR5IGdyYW51bGFyaXR5KQogICAgIGFk anVzdFNlbGVjdGlvblRvQXZvaWRDcm9zc2luZ0VkaXRpbmdCb3VuZGFyaWVzKCk7CiAgICAgdXBk YXRlU2VsZWN0aW9uVHlwZSgpOwogCi0gICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBtX3N0 YXJ0ICE9IHN0YXJ0QmVmb3JlQWRqdXN0bWVudHM7Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVGb2N1 cyA9IG1fZW5kICE9IGVuZEJlZm9yZUFkanVzdG1lbnRzOworICAgIGJvb2wgc2hvdWxkVXBkYXRl QW5jaG9yID0gZmFsc2U7CisgICAgYm9vbCBzaG91bGRVcGRhdGVGb2N1cyA9IGZhbHNlOwogCiAg ICAgaWYgKGlzUmFuZ2UoKSkgewogICAgICAgICAvLyAiQ29uc3RyYWluIiB0aGUgc2VsZWN0aW9u IHRvIGJlIHRoZSBzbWFsbGVzdCBlcXVpdmFsZW50IHJhbmdlIG9mIG5vZGVzLgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFl ZWI4YzYzZjMyNTgwYmQzYjYwYmYxMTI4NzgxNzM3MWNhYzg5MzguLmRiMTIzYmM1MTJjN2NjNjgy ZmMwYjk3ODkwYTc1YWE2MmE5NjNmNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0xMC0y MSAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0 b3AgZ2FwIHBhdGNoIGZpeCBmb3IgcmVncmVzc2lvbiBpbiByMjY3MzI5LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4MDIwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9k b3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFn LW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiByZXNvdXJjZXMv dWktaGVscGVyLmpzOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmRvdWJsZUNsaWNrQXRNb3Vz ZURvd24pOgorICAgICAgICAod2luZG93LlVJSGVscGVyLm1vdXNlVXApOgorICAgICAgICAod2lu ZG93LlVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQpOgorICAgICAgICAod2luZG93LlVJ SGVscGVyLmRvdWJsZUNsaWNrRWxlbWVudE1vdXNlRG93bik6CisKIDIwMjAtMTAtMjAgIEFudG9p bmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2 ODQ4Myk6IE1hcCBqdW1wcyBhcm91bmQgd2hpbGUgem9vbWluZyBvbiB3aW5keS5jb20sIHN0cmF2 YS5jb20KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9kb3Vi bGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zl ci1hbmNob3ItdG8tc2VsZWN0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNTM1OTY1OGI1NTY2 NGM3ZTU0YTc0OTM5ZTgxYmFjMTE4YmJjOGVhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hv ci10by1zZWxlY3QtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNTYgQEAKKworQmVmb3JlIGV4dGVu ZGluZyB0aGUgc2VsZWN0aW9uOgorfCAiCisgICAgIgorfCA8cD4KK3wgICAiVGhlICIKK3wgICA8 c3Bhbj4KK3wgICAgIGlkPSJlbmQiCit8ICAgICAicXVpY2siCit8ICAgIiAiCit8ICAgPHNwYW4+ Cit8ICAgICBpZD0ibWlkZGxlMyIKK3wgICAgICJicm93biIKK3wgICAiICIKK3wgICA8c3Bhbj4K K3wgICAgIGlkPSJtaWRkbGUyIgorfCAgICAgImZveCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wg ICAgIGlkPSJtaWRkbGUxIgorfCAgICAgImp1bXBlZCIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wg ICAgIGlkPSJzdGFydCIKK3wgICAgICJvdmVyIgorfCAgICIgdGhlIGxhenkgZG9nLiBBbmQgdGhl biB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS4iCit8ICIKKyIKKworcXVpY2sgYnJvd24gZm94 IGp1bXBlZCBvdmVyOgorfCAiCisgICAgIgorfCA8cD4KK3wgICAiVGhlICIKK3wgICA8c3Bhbj4K K3wgICAgIGlkPSJlbmQiCit8ICAgICAiPCNzZWxlY3Rpb24tZm9jdXM+cXVpY2siCit8ICAgIiAi Cit8ICAgPHNwYW4+Cit8ICAgICBpZD0ibWlkZGxlMyIKK3wgICAgICJicm93biIKK3wgICAiICIK K3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUyIgorfCAgICAgImZveCIKK3wgICAiICIKK3wg ICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUxIgorfCAgICAgImp1bXBlZCIKK3wgICAiICIKK3wg ICA8c3Bhbj4KK3wgICAgIGlkPSJzdGFydCIKK3wgICAgICJvdmVyPCNzZWxlY3Rpb24tYW5jaG9y PiIKK3wgICAiIHRoZSBsYXp5IGRvZy4gQW5kIHRoZW4gdGhlcmUgd2FzIGFub3RoZXIgc2VudGVu Y2UuIgorfCAiCisiCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rp b24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1sIGIvTGF5 b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVy LWFuY2hvci10by1zZWxlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZDg3NDMxZTRmNmI4YmUwZjFmNTEz OTg3MTk5Mzc1MzAwZmUxNmNlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxl Y3QuaHRtbApAQCAtMCwwICsxLDUyIEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVz dC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxodG1sPgorPGhlYWQ+ Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0 aWFsLXNjYWxlPTEiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1 cC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5q cyI+PC9zY3JpcHQ+Cis8c3R5bGU+CitwIHsKKyAgICBmb250LXNpemU6IDIwcHg7Cit9CisKK3Ag KyBwIHsKKyAgICBtYXJnaW4tdG9wOiAxMDBweDsKK30KKworI3N0YXJ0IHsKKyAgICBib3JkZXI6 IDFweCBzb2xpZCBibHVlOworfQorCisjZW5kIHsKKyAgICBwYWRkaW5nLXJpZ2h0OiAycHg7Cisg ICAgYm9yZGVyOiAxcHggc29saWQgdG9tYXRvOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 PgorPGRpdj5UaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCBkb3VibGUtY2xpY2tpbmcgYW5kIHRoZW4g ZHJhZ2dpbmcgb3ZlciB0aGUgc2VsZWN0aW9uIGFuY2hvciBwb2ludCAoaW4gTFRSIGxhbmd1YWdl cywgdGhpcyBpcyBkcmFnZ2luZyBsZWZ0KSB0byBleHRlbmQgdGhlIHRleHQgc2VsZWN0aW9uIGRv ZXMgbm90IGV4dGVuZCB0aGUgc2VsZWN0aW9uIGZyb20gdGhlIG9yaWdpbmFsIHNlbGVjdGlvbiBm b2N1cyBhcyB3ZWxsIChpbiBMUlQgbGFuZ3VhZ2VzLCB0aGUgc2VsZWN0aW9uIHNob3VsZCBub3Qg ZXh0ZW50IHRvIHRoZSByaWdodCBhcyB3ZWxsIHdoaWxlIGRyYWdnaW5nIGxlZnQpLiBUbyB0ZXN0 IG1hbnVhbGx5LCBsb2FkIHRoZSBwYWdlIGFuZCBkb3VibGUgY2xpY2sgb24gJ292ZXInIGFuZCBk cmFnIHRvICdxdWljaycuIFRoZSB0ZXh0ICdxdWljayBicm93biBmb3gganVtcGVkIG92ZXInIHNo b3VsZCBiZSBzZWxlY3RlZCwgYW5kIG5vdGhpbmcgZWxzZS48L2Rpdj4KKzxkaXYgaWQ9ImNvbnRh aW5lciI+CisgICAgPHA+VGhlIDxzcGFuIGlkPSJlbmQiPnF1aWNrPC9zcGFuPiA8c3BhbiBpZD0i bWlkZGxlMyI+YnJvd248L3NwYW4+IDxzcGFuIGlkPSJtaWRkbGUyIj5mb3g8L3NwYW4+IDxzcGFu IGlkPSJtaWRkbGUxIj5qdW1wZWQ8L3NwYW4+IDxzcGFuIGlkPSJzdGFydCI+b3Zlcjwvc3Bhbj4g dGhlIGxhenkgZG9nLiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS48L3A+Cis8 L2Rpdj4KKzxzY3JpcHQ+CisKKyhhc3luYyBmdW5jdGlvbiAoKSB7CisgICAgaWYgKCF3aW5kb3cu dGVzdFJ1bm5lcikKKyAgICAgICAgcmV0dXJuOworCisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNl dEVkaXRpbmdCZWhhdmlvcigiTWFjIik7CisgICAgTWFya3VwLmR1bXAoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNvbnRhaW5lciIpLCAiQmVmb3JlIGV4dGVuZGluZyB0aGUgc2VsZWN0aW9uIik7 CisKKyAgICBVSUhlbHBlci5kb3VibGVDbGlja0VsZW1lbnRNb3VzZURvd24oZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInN0YXJ0IikpOworICAgIFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1l bnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1pZGRsZTEiKSk7CisgICAgVUlIZWxwZXIuZHJh Z01vdXNlQWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWlkZGxlMiIpKTsK KyAgICBVSUhlbHBlci5kcmFnTW91c2VBY3Jvc3NFbGVtZW50KGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJtaWRkbGUzIikpOworICAgIFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVuZCIpKTsKKyAgICBVSUhlbHBlci5tb3VzZVVwKCk7CisK KyAgICBNYXJrdXAuZHVtcChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFpbmVyIiksIGRv Y3VtZW50LmdldFNlbGVjdGlvbigpLnRvU3RyaW5nKCkpOworICAgIE1hcmt1cC5ub3RpZnlEb25l KCk7Cit9KSgpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5q cyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKaW5kZXggMjU0OTNlY2I4ZDMz MTBlMWQ5Yjc2ZTQwMGUzYzhmZjczMWZmMjU4YS4uNjlmMDI4NjUyMmIyNzBjMmQ1NjNjYzk5YmY1 NTZhYWU3YzlhZDIzZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBl ci5qcworKysgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCkBAIC0xOSw2ICsx OSwxOSBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlVXAoKTsKICAgICB9CiAKKyAgICBzdGF0aWMgZG91YmxlQ2xpY2tBdE1vdXNl RG93bih4MSwgeTEpCisgICAgeworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwg eTEpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICAgICAgZXZlbnRTZW5k ZXIubW91c2VVcCgpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICB9CisK KyAgICBzdGF0aWMgbW91c2VVcCgpCisgICAgeworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVw KCk7CisgICAgfQorCiAgICAgc3RhdGljIGRvdWJsZUNsaWNrQXRUaGVuRHJhZ1RvKHgxLCB5MSwg eDIsIHkyKQogICAgIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDEsIHkxKTsK QEAgLTI5LDYgKzQyLDI4IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwogICAgIH0KIAorICAgIHN0YXRpYyBkcmFnTW91 c2VBY3Jvc3NFbGVtZW50KGVsZW1lbnQpCisgICAgeworICAgICAgICBjb25zdCB4MSA9IGVsZW1l bnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGg7CisgICAgICAgIGNvbnN0IHgyID0g ZWxlbWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aCAqIC43NTsKKyAgICAgICAg Y29uc3QgeDMgPSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gMjsK KyAgICAgICAgY29uc3QgeDQgPSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdp ZHRoIC8gNDsKKyAgICAgICAgY29uc3QgeDUgPSBlbGVtZW50Lm9mZnNldExlZnQ7CisgICAgICAg IGNvbnN0IHkgPSBlbGVtZW50Lm9mZnNldFRvcCArIGVsZW1lbnQub2Zmc2V0SGVpZ2h0IC8gMjsK KyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDEsIHkpOworICAgICAgICBldmVudFNl bmRlci5tb3VzZU1vdmVUbyh4MiwgeSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRv KHgzLCB5KTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDQsIHkpOworICAgICAg ICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4NSwgeSk7CisgICAgfQorCisgICAgc3RhdGljIGRv dWJsZUNsaWNrRWxlbWVudE1vdXNlRG93bihlbGVtZW50MSkKKyAgICB7CisgICAgICAgIGNvbnN0 IHgxID0gZWxlbWVudDEub2Zmc2V0TGVmdCArIGVsZW1lbnQxLm9mZnNldFdpZHRoIC8gMjsKKyAg ICAgICAgY29uc3QgeTEgPSBlbGVtZW50MS5vZmZzZXRUb3AgKyBlbGVtZW50MS5vZmZzZXRIZWln aHQgLyAyOworICAgICAgICByZXR1cm4gVUlIZWxwZXIuZG91YmxlQ2xpY2tBdE1vdXNlRG93bih4 MSwgeTEpOworICAgIH0KKwogICAgIHN0YXRpYyBhc3luYyBtb3ZlTW91c2VBbmRXYWl0Rm9yRnJh bWUoeCwgeSkKICAgICB7CiAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwo= 412019 2020-10-21 12:53:30 -0700 2020-10-21 14:59:43 -0700 Patch bug-218020-20201021125329.patch text/plain 8584 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uMmNlZTM4Zjg0YTNhMDVkOTc3MDlhOTIzNmE5NGZh ZGM0MzFhMzU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzY5NTQyNDU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSByZWZhY3RvcmluZyBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE2NzM5IGNhdXNlZCBzZWxlY3Rpb25zIHRvIAorICAgICAgICBleHBhbmQgaW4g Ym90aCBkaXJlY3Rpb25zIGFmdGVyIGEgZG91YmxlLWNsaWNrIGFuZCBkcmFnIHRvIGV4cGFuZCBv biBtYWMuIFRoaXMgYmVoYXZpb3IKKyAgICAgICAgd2FzIG5vdCBvYnNlcnZlZCBvbiBpT1MuIFRo aXMgcmVtb3ZlcyB0aGUgZXJyb3ItcHJvbmUgY2FsY3VsYXRpb24uIAorICAgICAgICBOb3RlIHRo YXQgdGhpcyBidWcgZG9lcyBub3Qgb2NjdXIgaWYgb25seSB0ZXN0aW5nIGltbWVkaWF0bHkgbW92 aW5nIHRoZSBkcmFnIHBvaW50IHRvIHRoZQorICAgICAgICBlbmQgb2YgdGhlIHNlbGVjdGlvbi4g RHJhZ2dpbmcgYWNyb3NzIGFsbCB0aGUgd29yZHMgYXMgYSByZWFsIHVzZXIgd291bGQgbmVlZHMg dG8gYmUgZW11bGF0ZWQuIAorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJs ZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QuaHRtbAorCisgICAgICAgICog ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVT ZWxlY3Rpb246OnZhbGlkYXRlKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgzKTogTWFwIGp1bXBz IGFyb3VuZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNvbQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKaW5kZXggM2EyMzkzOTUyZGRjOWVj N2NjNWVmMzg4OTRjNTQ5Y2ZlYzYzOWU0Mi4uYzBmMGExMjY1M2FhMDY3ODIyMjk5MTQyZmUyYWM1 OWI1NmVkMDViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2Vs ZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24u Y3BwCkBAIC0zODYsOCArMzg2LDggQEAgdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjp2YWxpZGF0ZShU ZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCiAgICAgYWRqdXN0U2VsZWN0aW9uVG9Bdm9pZENy b3NzaW5nRWRpdGluZ0JvdW5kYXJpZXMoKTsKICAgICB1cGRhdGVTZWxlY3Rpb25UeXBlKCk7CiAK LSAgICBib29sIHNob3VsZFVwZGF0ZUFuY2hvciA9IG1fc3RhcnQgIT0gc3RhcnRCZWZvcmVBZGp1 c3RtZW50czsKLSAgICBib29sIHNob3VsZFVwZGF0ZUZvY3VzID0gbV9lbmQgIT0gZW5kQmVmb3Jl QWRqdXN0bWVudHM7CisgICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBmYWxzZTsKKyAgICBi b29sIHNob3VsZFVwZGF0ZUZvY3VzID0gZmFsc2U7CiAKICAgICBpZiAoaXNSYW5nZSgpKSB7CiAg ICAgICAgIC8vICJDb25zdHJhaW4iIHRoZSBzZWxlY3Rpb24gdG8gYmUgdGhlIHNtYWxsZXN0IGVx dWl2YWxlbnQgcmFuZ2Ugb2Ygbm9kZXMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWVlYjhjNjNmMzI1ODBiZDNiNjBiZjEx Mjg3ODE3MzcxY2FjODkzOC4uZGIxMjNiYzUxMmM3Y2M2ODJmYzBiOTc4OTBhNzVhYTYyYTk2M2Y3 OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTEwLTIxICBNZWdhbiBHYXJkbmVyICA8bWVn YW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAgcGF0Y2ggZml4IGZvciBy ZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1v dmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0 aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0 Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAgICAg ICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlQ2xpY2tBdE1vdXNlRG93bik6CisgICAgICAgICh3aW5k b3cuVUlIZWxwZXIubW91c2VVcCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZHJhZ01vdXNl QWNyb3NzRWxlbWVudCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlQ2xpY2tFbGVt ZW50TW91c2VEb3duKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgzKTogTWFwIGp1bXBzIGFyb3Vu ZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNvbQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVy LWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMv c2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1MzU5NjU4YjU1NjY0YzdlNTRhNzQ5MzllODFiYWMxMThi YmM4ZWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rp b24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSw1NiBAQAorCitCZWZvcmUgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb246Cit8 ICIKKyAgICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9ImVuZCIK K3wgICAgICJxdWljayIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUzIgor fCAgICAgImJyb3duIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1pZGRsZTIiCit8 ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1pZGRsZTEiCit8ICAg ICAianVtcGVkIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9InN0YXJ0IgorfCAgICAg Im92ZXIiCit8ICAgIiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVuIHRoZXJlIHdhcyBhbm90aGVyIHNl bnRlbmNlLiIKK3wgIgorIgorCitxdWljayBicm93biBmb3gganVtcGVkIG92ZXI6Cit8ICIKKyAg ICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9ImVuZCIKK3wgICAg ICI8I3NlbGVjdGlvbi1mb2N1cz5xdWljayIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlk PSJtaWRkbGUzIgorfCAgICAgImJyb3duIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9 Im1pZGRsZTIiCit8ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1p ZGRsZTEiCit8ICAgICAianVtcGVkIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9InN0 YXJ0IgorfCAgICAgIm92ZXI8I3NlbGVjdGlvbi1hbmNob3I+IgorfCAgICIgdGhlIGxhenkgZG9n LiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS4iCit8ICIKKyIKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRy YWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9z ZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmRkODc0MzFlNGY2YjhiZTBmMWY1MTM5ODcxOTkzNzUzMDBmZTE2Y2UKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rpb24vZG91Ymxl LWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1sCkBAIC0wLDAgKzEsNTIg QEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxl Vmlld3BvcnQ9dHJ1ZSBdIC0tPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIG5hbWU9InZpZXdwb3J0 IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSI+Cis8c2NyaXB0 IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4K K3AgeworICAgIGZvbnQtc2l6ZTogMjBweDsKK30KKworcCArIHAgeworICAgIG1hcmdpbi10b3A6 IDEwMHB4OworfQorCisjc3RhcnQgeworICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsdWU7Cit9CisK KyNlbmQgeworICAgIHBhZGRpbmctcmlnaHQ6IDJweDsKKyAgICBib3JkZXI6IDFweCBzb2xpZCB0 b21hdG87Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2PlRoaXMgdGVzdCB2ZXJp ZmllcyB0aGF0IGRvdWJsZS1jbGlja2luZyBhbmQgdGhlbiBkcmFnZ2luZyBvdmVyIHRoZSBzZWxl Y3Rpb24gYW5jaG9yIHBvaW50IChpbiBMVFIgbGFuZ3VhZ2VzLCB0aGlzIGlzIGRyYWdnaW5nIGxl ZnQpIHRvIGV4dGVuZCB0aGUgdGV4dCBzZWxlY3Rpb24gZG9lcyBub3QgZXh0ZW5kIHRoZSBzZWxl Y3Rpb24gZnJvbSB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uIGZvY3VzIGFzIHdlbGwgKGluIExSVCBs YW5ndWFnZXMsIHRoZSBzZWxlY3Rpb24gc2hvdWxkIG5vdCBleHRlbnQgdG8gdGhlIHJpZ2h0IGFz IHdlbGwgd2hpbGUgZHJhZ2dpbmcgbGVmdCkuIFRvIHRlc3QgbWFudWFsbHksIGxvYWQgdGhlIHBh Z2UgYW5kIGRvdWJsZSBjbGljayBvbiAnb3ZlcicgYW5kIGRyYWcgdG8gJ3F1aWNrJy4gVGhlIHRl eHQgJ3F1aWNrIGJyb3duIGZveCBqdW1wZWQgb3Zlcicgc2hvdWxkIGJlIHNlbGVjdGVkLCBhbmQg bm90aGluZyBlbHNlLjwvZGl2PgorPGRpdiBpZD0iY29udGFpbmVyIj4KKyAgICA8cD5UaGUgPHNw YW4gaWQ9ImVuZCI+cXVpY2s8L3NwYW4+IDxzcGFuIGlkPSJtaWRkbGUzIj5icm93bjwvc3Bhbj4g PHNwYW4gaWQ9Im1pZGRsZTIiPmZveDwvc3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTEiPmp1bXBlZDwv c3Bhbj4gPHNwYW4gaWQ9InN0YXJ0Ij5vdmVyPC9zcGFuPiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVu IHRoZXJlIHdhcyBhbm90aGVyIHNlbnRlbmNlLjwvcD4KKzwvZGl2PgorPHNjcmlwdD4KKworKGFz eW5jIGZ1bmN0aW9uICgpIHsKKyAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICBy ZXR1cm47CisKKyAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJNYWMi KTsKKyAgICBNYXJrdXAuZHVtcChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFpbmVyIiks ICJCZWZvcmUgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb24iKTsKKworICAgIFVJSGVscGVyLmRvdWJs ZUNsaWNrRWxlbWVudE1vdXNlRG93bihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3RhcnQiKSk7 CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgibWlkZGxlMSIpKTsKKyAgICBVSUhlbHBlci5kcmFnTW91c2VBY3Jvc3NFbGVtZW50KGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJtaWRkbGUyIikpOworICAgIFVJSGVscGVyLmRyYWdNb3Vz ZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1pZGRsZTMiKSk7CisgICAg VUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi ZW5kIikpOworICAgIFVJSGVscGVyLm1vdXNlVXAoKTsKKworICAgIE1hcmt1cC5kdW1wKGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJjb250YWluZXIiKSwgZG9jdW1lbnQuZ2V0U2VsZWN0aW9uKCku dG9TdHJpbmcoKSk7CisgICAgTWFya3VwLm5vdGlmeURvbmUoKTsKK30pKCk7Cis8L3NjcmlwdD4K KzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMvcmVzb3Vy Y2VzL3VpLWhlbHBlci5qcwppbmRleCAyNTQ5M2VjYjhkMzMxMGUxZDliNzZlNDAwZTNjOGZmNzMx ZmYyNThhLi42OWYwMjg2NTIyYjI3MGMyZDU2M2NjOTliZjU1NmFhZTdjOWFkMjNkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91dFRlc3Rz L3Jlc291cmNlcy91aS1oZWxwZXIuanMKQEAgLTE5LDYgKzE5LDE5IEBAIHdpbmRvdy5VSUhlbHBl ciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOwogICAg IH0KIAorICAgIHN0YXRpYyBkb3VibGVDbGlja0F0TW91c2VEb3duKHgxLCB5MSkKKyAgICB7Cisg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgxLCB5MSk7CisgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlRG93bigpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIH0KKworICAgIHN0YXRpYyBtb3VzZVVwKCkK KyAgICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICB9CisKICAgICBzdGF0 aWMgZG91YmxlQ2xpY2tBdFRoZW5EcmFnVG8oeDEsIHkxLCB4MiwgeTIpCiAgICAgewogICAgICAg ICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeTEpOwpAQCAtMjksNiArNDIsMjggQEAgd2lu ZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogICAgICAgICBldmVudFNlbmRlci5tb3Vz ZVVwKCk7CiAgICAgfQogCisgICAgc3RhdGljIGRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZWxlbWVu dCkKKyAgICB7CisgICAgICAgIGNvbnN0IHgxID0gZWxlbWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVu dC5vZmZzZXRXaWR0aDsKKyAgICAgICAgY29uc3QgeDIgPSBlbGVtZW50Lm9mZnNldExlZnQgKyBl bGVtZW50Lm9mZnNldFdpZHRoICogLjc1OworICAgICAgICBjb25zdCB4MyA9IGVsZW1lbnQub2Zm c2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGggLyAyOworICAgICAgICBjb25zdCB4NCA9IGVs ZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGggLyA0OworICAgICAgICBjb25z dCB4NSA9IGVsZW1lbnQub2Zmc2V0TGVmdDsKKyAgICAgICAgY29uc3QgeSA9IGVsZW1lbnQub2Zm c2V0VG9wICsgZWxlbWVudC5vZmZzZXRIZWlnaHQgLyAyOworICAgICAgICBldmVudFNlbmRlci5t b3VzZU1vdmVUbyh4MSwgeSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgyLCB5 KTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDMsIHkpOworICAgICAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbyh4NCwgeSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92 ZVRvKHg1LCB5KTsKKyAgICB9CisKKyAgICBzdGF0aWMgZG91YmxlQ2xpY2tFbGVtZW50TW91c2VE b3duKGVsZW1lbnQxKQorICAgIHsKKyAgICAgICAgY29uc3QgeDEgPSBlbGVtZW50MS5vZmZzZXRM ZWZ0ICsgZWxlbWVudDEub2Zmc2V0V2lkdGggLyAyOworICAgICAgICBjb25zdCB5MSA9IGVsZW1l bnQxLm9mZnNldFRvcCArIGVsZW1lbnQxLm9mZnNldEhlaWdodCAvIDI7CisgICAgICAgIHJldHVy biBVSUhlbHBlci5kb3VibGVDbGlja0F0TW91c2VEb3duKHgxLCB5MSk7CisgICAgfQorCiAgICAg c3RhdGljIGFzeW5jIG1vdmVNb3VzZUFuZFdhaXRGb3JGcmFtZSh4LCB5KQogICAgIHsKICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7Cg== 412033 2020-10-21 14:56:57 -0700 2020-10-21 15:54:23 -0700 Patch bug-218020-20201021145656.patch text/plain 8590 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uMmNlZTM4Zjg0YTNhMDVkOTc3MDlhOTIzNmE5NGZh ZGM0MzFhMzU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzY5NTQyNDU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSByZWZhY3RvcmluZyBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE2NzM5IGNhdXNlZCBzZWxlY3Rpb25zIHRvIAorICAgICAgICBleHBhbmQgaW4g Ym90aCBkaXJlY3Rpb25zIGFmdGVyIGEgZG91YmxlLWNsaWNrIGFuZCBkcmFnIHRvIGV4cGFuZCBv biBtYWMuIFRoaXMgYmVoYXZpb3IKKyAgICAgICAgd2FzIG5vdCBvYnNlcnZlZCBvbiBpT1MuIFRo aXMgcmVtb3ZlcyB0aGUgZXJyb3ItcHJvbmUgY2FsY3VsYXRpb24uIAorICAgICAgICBOb3RlIHRo YXQgdGhpcyBidWcgZG9lcyBub3Qgb2NjdXIgaWYgb25seSB0ZXN0aW5nIGltbWVkaWF0bHkgbW92 aW5nIHRoZSBkcmFnIHBvaW50IHRvIHRoZQorICAgICAgICBlbmQgb2YgdGhlIHNlbGVjdGlvbi4g RHJhZ2dpbmcgYWNyb3NzIGFsbCB0aGUgd29yZHMgYXMgYSByZWFsIHVzZXIgd291bGQgbmVlZHMg dG8gYmUgZW11bGF0ZWQuIAorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJs ZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QuaHRtbAorCisgICAgICAgICog ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVT ZWxlY3Rpb246OnZhbGlkYXRlKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgzKTogTWFwIGp1bXBz IGFyb3VuZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNvbQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKaW5kZXggM2EyMzkzOTUyZGRjOWVj N2NjNWVmMzg4OTRjNTQ5Y2ZlYzYzOWU0Mi4uYzBmMGExMjY1M2FhMDY3ODIyMjk5MTQyZmUyYWM1 OWI1NmVkMDViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2Vs ZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24u Y3BwCkBAIC0zODYsOCArMzg2LDggQEAgdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjp2YWxpZGF0ZShU ZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCiAgICAgYWRqdXN0U2VsZWN0aW9uVG9Bdm9pZENy b3NzaW5nRWRpdGluZ0JvdW5kYXJpZXMoKTsKICAgICB1cGRhdGVTZWxlY3Rpb25UeXBlKCk7CiAK LSAgICBib29sIHNob3VsZFVwZGF0ZUFuY2hvciA9IG1fc3RhcnQgIT0gc3RhcnRCZWZvcmVBZGp1 c3RtZW50czsKLSAgICBib29sIHNob3VsZFVwZGF0ZUZvY3VzID0gbV9lbmQgIT0gZW5kQmVmb3Jl QWRqdXN0bWVudHM7CisgICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBmYWxzZTsKKyAgICBi b29sIHNob3VsZFVwZGF0ZUZvY3VzID0gZmFsc2U7CiAKICAgICBpZiAoaXNSYW5nZSgpKSB7CiAg ICAgICAgIC8vICJDb25zdHJhaW4iIHRoZSBzZWxlY3Rpb24gdG8gYmUgdGhlIHNtYWxsZXN0IGVx dWl2YWxlbnQgcmFuZ2Ugb2Ygbm9kZXMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWVlYjhjNjNmMzI1ODBiZDNiNjBiZjEx Mjg3ODE3MzcxY2FjODkzOC4uZGIxMjNiYzUxMmM3Y2M2ODJmYzBiOTc4OTBhNzVhYTYyYTk2M2Y3 OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTEwLTIxICBNZWdhbiBHYXJkbmVyICA8bWVn YW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAgcGF0Y2ggZml4IGZvciBy ZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1v dmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0 aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0 Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAgICAg ICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlQ2xpY2tBdE1vdXNlRG93bik6CisgICAgICAgICh3aW5k b3cuVUlIZWxwZXIubW91c2VVcCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZHJhZ01vdXNl QWNyb3NzRWxlbWVudCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlQ2xpY2tFbGVt ZW50TW91c2VEb3duKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgzKTogTWFwIGp1bXBzIGFyb3Vu ZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNvbQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVy LWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMv c2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1MzU5NjU4YjU1NjY0YzdlNTRhNzQ5MzllODFiYWMxMThi YmM4ZWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rp b24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSw1NiBAQAorCitCZWZvcmUgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb246Cit8 ICIKKyAgICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9ImVuZCIK K3wgICAgICJxdWljayIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUzIgor fCAgICAgImJyb3duIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1pZGRsZTIiCit8 ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1pZGRsZTEiCit8ICAg ICAianVtcGVkIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9InN0YXJ0IgorfCAgICAg Im92ZXIiCit8ICAgIiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVuIHRoZXJlIHdhcyBhbm90aGVyIHNl bnRlbmNlLiIKK3wgIgorIgorCitxdWljayBicm93biBmb3gganVtcGVkIG92ZXI6Cit8ICIKKyAg ICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9ImVuZCIKK3wgICAg ICI8I3NlbGVjdGlvbi1mb2N1cz5xdWljayIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wgICAgIGlk PSJtaWRkbGUzIgorfCAgICAgImJyb3duIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9 Im1pZGRsZTIiCit8ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9Im1p ZGRsZTEiCit8ICAgICAianVtcGVkIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAgaWQ9InN0 YXJ0IgorfCAgICAgIm92ZXI8I3NlbGVjdGlvbi1hbmNob3I+IgorfCAgICIgdGhlIGxhenkgZG9n LiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS4iCit8ICIKKyIKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRy YWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9z ZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmFmMTgzYTc2MzFlNDAwY2U5YzEwMmQyYjU3MGNjMTJiZDljZmMyNTMKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rpb24vZG91Ymxl LWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5odG1sCkBAIC0wLDAgKzEsNTIg QEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxl Vmlld3BvcnQ9dHJ1ZSBdIC0tPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIG5hbWU9InZpZXdwb3J0 IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSI+Cis8c2NyaXB0 IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKzxz dHlsZT4KK3AgeworICAgIGZvbnQtc2l6ZTogMjBweDsKK30KKworcCArIHAgeworICAgIG1hcmdp bi10b3A6IDEwMHB4OworfQorCisjc3RhcnQgeworICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsdWU7 Cit9CisKKyNlbmQgeworICAgIHBhZGRpbmctcmlnaHQ6IDJweDsKKyAgICBib3JkZXI6IDFweCBz b2xpZCB0b21hdG87Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2PlRoaXMgdGVz dCB2ZXJpZmllcyB0aGF0IGRvdWJsZS1jbGlja2luZyBhbmQgdGhlbiBkcmFnZ2luZyBvdmVyIHRo ZSBzZWxlY3Rpb24gYW5jaG9yIHBvaW50IChpbiBMVFIgbGFuZ3VhZ2VzLCB0aGlzIGlzIGRyYWdn aW5nIGxlZnQpIHRvIGV4dGVuZCB0aGUgdGV4dCBzZWxlY3Rpb24gZG9lcyBub3QgZXh0ZW5kIHRo ZSBzZWxlY3Rpb24gZnJvbSB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uIGZvY3VzIGFzIHdlbGwgKGlu IExSVCBsYW5ndWFnZXMsIHRoZSBzZWxlY3Rpb24gc2hvdWxkIG5vdCBleHRlbnQgdG8gdGhlIHJp Z2h0IGFzIHdlbGwgd2hpbGUgZHJhZ2dpbmcgbGVmdCkuIFRvIHRlc3QgbWFudWFsbHksIGxvYWQg dGhlIHBhZ2UgYW5kIGRvdWJsZSBjbGljayBvbiAnb3ZlcicgYW5kIGRyYWcgdG8gJ3F1aWNrJy4g VGhlIHRleHQgJ3F1aWNrIGJyb3duIGZveCBqdW1wZWQgb3Zlcicgc2hvdWxkIGJlIHNlbGVjdGVk LCBhbmQgbm90aGluZyBlbHNlLjwvZGl2PgorPGRpdiBpZD0iY29udGFpbmVyIj4KKyAgICA8cD5U aGUgPHNwYW4gaWQ9ImVuZCI+cXVpY2s8L3NwYW4+IDxzcGFuIGlkPSJtaWRkbGUzIj5icm93bjwv c3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTIiPmZveDwvc3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTEiPmp1 bXBlZDwvc3Bhbj4gPHNwYW4gaWQ9InN0YXJ0Ij5vdmVyPC9zcGFuPiB0aGUgbGF6eSBkb2cuIEFu ZCB0aGVuIHRoZXJlIHdhcyBhbm90aGVyIHNlbnRlbmNlLjwvcD4KKzwvZGl2PgorPHNjcmlwdD4K KworKGFzeW5jIGZ1bmN0aW9uICgpIHsKKyAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorICAg ICAgICByZXR1cm47CisKKyAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9y KCJNYWMiKTsKKyAgICBNYXJrdXAuZHVtcChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFp bmVyIiksICJCZWZvcmUgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb24iKTsKKworICAgIFVJSGVscGVy LmRvdWJsZUNsaWNrRWxlbWVudE1vdXNlRG93bihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3Rh cnQiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgibWlkZGxlMSIpKTsKKyAgICBVSUhlbHBlci5kcmFnTW91c2VBY3Jvc3NFbGVt ZW50KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtaWRkbGUyIikpOworICAgIFVJSGVscGVyLmRy YWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1pZGRsZTMiKSk7 CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiZW5kIikpOworICAgIFVJSGVscGVyLm1vdXNlVXAoKTsKKworICAgIE1hcmt1cC5kdW1w KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250YWluZXIiKSwgZG9jdW1lbnQuZ2V0U2VsZWN0 aW9uKCkudG9TdHJpbmcoKSk7CisgICAgTWFya3VwLm5vdGlmeURvbmUoKTsKK30pKCk7Cis8L3Nj cmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMv cmVzb3VyY2VzL3VpLWhlbHBlci5qcwppbmRleCAyNTQ5M2VjYjhkMzMxMGUxZDliNzZlNDAwZTNj OGZmNzMxZmYyNThhLi42OWYwMjg2NTIyYjI3MGMyZDU2M2NjOTliZjU1NmFhZTdjOWFkMjNkIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91 dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKQEAgLTE5LDYgKzE5LDE5IEBAIHdpbmRvdy5V SUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VVcCgp OwogICAgIH0KIAorICAgIHN0YXRpYyBkb3VibGVDbGlja0F0TW91c2VEb3duKHgxLCB5MSkKKyAg ICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgxLCB5MSk7CisgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7Cisg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIH0KKworICAgIHN0YXRpYyBtb3Vz ZVVwKCkKKyAgICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICB9CisKICAg ICBzdGF0aWMgZG91YmxlQ2xpY2tBdFRoZW5EcmFnVG8oeDEsIHkxLCB4MiwgeTIpCiAgICAgewog ICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeTEpOwpAQCAtMjksNiArNDIsMjgg QEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogICAgICAgICBldmVudFNlbmRl ci5tb3VzZVVwKCk7CiAgICAgfQogCisgICAgc3RhdGljIGRyYWdNb3VzZUFjcm9zc0VsZW1lbnQo ZWxlbWVudCkKKyAgICB7CisgICAgICAgIGNvbnN0IHgxID0gZWxlbWVudC5vZmZzZXRMZWZ0ICsg ZWxlbWVudC5vZmZzZXRXaWR0aDsKKyAgICAgICAgY29uc3QgeDIgPSBlbGVtZW50Lm9mZnNldExl ZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoICogLjc1OworICAgICAgICBjb25zdCB4MyA9IGVsZW1l bnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGggLyAyOworICAgICAgICBjb25zdCB4 NCA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGggLyA0OworICAgICAg ICBjb25zdCB4NSA9IGVsZW1lbnQub2Zmc2V0TGVmdDsKKyAgICAgICAgY29uc3QgeSA9IGVsZW1l bnQub2Zmc2V0VG9wICsgZWxlbWVudC5vZmZzZXRIZWlnaHQgLyAyOworICAgICAgICBldmVudFNl bmRlci5tb3VzZU1vdmVUbyh4MSwgeSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRv KHgyLCB5KTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeDMsIHkpOworICAgICAg ICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4NCwgeSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlTW92ZVRvKHg1LCB5KTsKKyAgICB9CisKKyAgICBzdGF0aWMgZG91YmxlQ2xpY2tFbGVtZW50 TW91c2VEb3duKGVsZW1lbnQxKQorICAgIHsKKyAgICAgICAgY29uc3QgeDEgPSBlbGVtZW50MS5v ZmZzZXRMZWZ0ICsgZWxlbWVudDEub2Zmc2V0V2lkdGggLyAyOworICAgICAgICBjb25zdCB5MSA9 IGVsZW1lbnQxLm9mZnNldFRvcCArIGVsZW1lbnQxLm9mZnNldEhlaWdodCAvIDI7CisgICAgICAg IHJldHVybiBVSUhlbHBlci5kb3VibGVDbGlja0F0TW91c2VEb3duKHgxLCB5MSk7CisgICAgfQor CiAgICAgc3RhdGljIGFzeW5jIG1vdmVNb3VzZUFuZFdhaXRGb3JGcmFtZSh4LCB5KQogICAgIHsK ICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7Cg== 412039 2020-10-21 15:54:26 -0700 2020-10-21 17:41:01 -0700 Patch bug-218020-20201021155425.patch text/plain 8722 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3MWUzYmMyNTQwZWFl NzY3NGM2ZTY3ODI2MWEwODg1MjlmOWM5ZC4uMmNlZTM4Zjg0YTNhMDVkOTc3MDlhOTIzNmE5NGZh ZGM0MzFhMzU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBnYXAg cGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzY5NTQyNDU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSByZWZhY3RvcmluZyBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE2NzM5IGNhdXNlZCBzZWxlY3Rpb25zIHRvIAorICAgICAgICBleHBhbmQgaW4g Ym90aCBkaXJlY3Rpb25zIGFmdGVyIGEgZG91YmxlLWNsaWNrIGFuZCBkcmFnIHRvIGV4cGFuZCBv biBtYWMuIFRoaXMgYmVoYXZpb3IKKyAgICAgICAgd2FzIG5vdCBvYnNlcnZlZCBvbiBpT1MuIFRo aXMgcmVtb3ZlcyB0aGUgZXJyb3ItcHJvbmUgY2FsY3VsYXRpb24uIAorICAgICAgICBOb3RlIHRo YXQgdGhpcyBidWcgZG9lcyBub3Qgb2NjdXIgaWYgb25seSB0ZXN0aW5nIGltbWVkaWF0bHkgbW92 aW5nIHRoZSBkcmFnIHBvaW50IHRvIHRoZQorICAgICAgICBlbmQgb2YgdGhlIHNlbGVjdGlvbi4g RHJhZ2dpbmcgYWNyb3NzIGFsbCB0aGUgd29yZHMgYXMgYSByZWFsIHVzZXIgd291bGQgbmVlZHMg dG8gYmUgZW11bGF0ZWQuIAorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJs ZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QuaHRtbAorCisgICAgICAgICog ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVT ZWxlY3Rpb246OnZhbGlkYXRlKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBRdWludCAgPGdyYW91 dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgzKTogTWFwIGp1bXBz IGFyb3VuZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNvbQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKaW5kZXggM2EyMzkzOTUyZGRjOWVj N2NjNWVmMzg4OTRjNTQ5Y2ZlYzYzOWU0Mi4uYWE1NDY0MTRlNDBlZmQ4MmM3YWUyMmU4NGZhMTRj M2JlNDg1NTkyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2Vs ZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24u Y3BwCkBAIC0zODYsOCArMzg2LDggQEAgdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjp2YWxpZGF0ZShU ZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkpCiAgICAgYWRqdXN0U2VsZWN0aW9uVG9Bdm9pZENy b3NzaW5nRWRpdGluZ0JvdW5kYXJpZXMoKTsKICAgICB1cGRhdGVTZWxlY3Rpb25UeXBlKCk7CiAK LSAgICBib29sIHNob3VsZFVwZGF0ZUFuY2hvciA9IG1fc3RhcnQgIT0gc3RhcnRCZWZvcmVBZGp1 c3RtZW50czsKLSAgICBib29sIHNob3VsZFVwZGF0ZUZvY3VzID0gbV9lbmQgIT0gZW5kQmVmb3Jl QWRqdXN0bWVudHM7CisgICAgYm9vbCBzaG91bGRVcGRhdGVBbmNob3IgPSBmYWxzZTsgLy8gU2V0 IHRvIGZhbHNlIGJlY2F1c2Ugb2YgPHJkYXI6Ly9wcm9ibGVtLzY5NTQyNDU5Pi4gQ2FuIGJlIHJl dHVybmVkIHRvIG9yaWdpbmFsIGxvZ2ljIHdoZW4gdGhpcyBwcm9ibGVtIGlzIGZ1bGx5IGZpeGVk LgorICAgIGJvb2wgc2hvdWxkVXBkYXRlRm9jdXMgPSBmYWxzZTsgLy8gRGl0dG8uCiAKICAgICBp ZiAoaXNSYW5nZSgpKSB7CiAgICAgICAgIC8vICJDb25zdHJhaW4iIHRoZSBzZWxlY3Rpb24gdG8g YmUgdGhlIHNtYWxsZXN0IGVxdWl2YWxlbnQgcmFuZ2Ugb2Ygbm9kZXMuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWVlYjhj NjNmMzI1ODBiZDNiNjBiZjExMjg3ODE3MzcxY2FjODkzOC4uZGIxMjNiYzUxMmM3Y2M2ODJmYzBi OTc4OTBhNzVhYTYyYTk2M2Y3OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTEwLTIxICBN ZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBn YXAgcGF0Y2ggZml4IGZvciByZWdyZXNzaW9uIGluIHIyNjczMjkuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgwMjAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL2RvdWJs ZS1jbGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9kb3VibGUtY2xpY2stYW5kLWRyYWctb3Zl ci1hbmNob3ItdG8tc2VsZWN0Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHJlc291cmNlcy91aS1o ZWxwZXIuanM6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlQ2xpY2tBdE1vdXNlRG93 bik6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIubW91c2VVcCk6CisgICAgICAgICh3aW5kb3cu VUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxw ZXIuZG91YmxlQ2xpY2tFbGVtZW50TW91c2VEb3duKToKKwogMjAyMC0xMC0yMCAgQW50b2luZSBR dWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4NDgz KTogTWFwIGp1bXBzIGFyb3VuZCB3aGlsZSB6b29taW5nIG9uIHdpbmR5LmNvbSwgc3RyYXZhLmNv bQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1j bGljay1hbmQtZHJhZy1vdmVyLWFuY2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZWRpdGluZy9tYWMvc2VsZWN0aW9uL2RvdWJsZS1jbGljay1hbmQtZHJhZy1vdmVyLWFu Y2hvci10by1zZWxlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1MzU5NjU4YjU1NjY0Yzdl NTRhNzQ5MzllODFiYWMxMThiYmM4ZWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9l ZGl0aW5nL21hYy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRv LXNlbGVjdC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1NiBAQAorCitCZWZvcmUgZXh0ZW5kaW5n IHRoZSBzZWxlY3Rpb246Cit8ICIKKyAgICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFu PgorfCAgICAgaWQ9ImVuZCIKK3wgICAgICJxdWljayIKK3wgICAiICIKK3wgICA8c3Bhbj4KK3wg ICAgIGlkPSJtaWRkbGUzIgorfCAgICAgImJyb3duIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAg ICAgaWQ9Im1pZGRsZTIiCit8ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAg aWQ9Im1pZGRsZTEiCit8ICAgICAianVtcGVkIgorfCAgICIgIgorfCAgIDxzcGFuPgorfCAgICAg aWQ9InN0YXJ0IgorfCAgICAgIm92ZXIiCit8ICAgIiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVuIHRo ZXJlIHdhcyBhbm90aGVyIHNlbnRlbmNlLiIKK3wgIgorIgorCitxdWljayBicm93biBmb3gganVt cGVkIG92ZXI6Cit8ICIKKyAgICAiCit8IDxwPgorfCAgICJUaGUgIgorfCAgIDxzcGFuPgorfCAg ICAgaWQ9ImVuZCIKK3wgICAgICI8I3NlbGVjdGlvbi1mb2N1cz5xdWljayIKK3wgICAiICIKK3wg ICA8c3Bhbj4KK3wgICAgIGlkPSJtaWRkbGUzIgorfCAgICAgImJyb3duIgorfCAgICIgIgorfCAg IDxzcGFuPgorfCAgICAgaWQ9Im1pZGRsZTIiCit8ICAgICAiZm94IgorfCAgICIgIgorfCAgIDxz cGFuPgorfCAgICAgaWQ9Im1pZGRsZTEiCit8ICAgICAianVtcGVkIgorfCAgICIgIgorfCAgIDxz cGFuPgorfCAgICAgaWQ9InN0YXJ0IgorfCAgICAgIm92ZXI8I3NlbGVjdGlvbi1hbmNob3I+Igor fCAgICIgdGhlIGxhenkgZG9nLiBBbmQgdGhlbiB0aGVyZSB3YXMgYW5vdGhlciBzZW50ZW5jZS4i Cit8ICIKKyIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvbWFjL3NlbGVjdGlvbi9k b3VibGUtY2xpY2stYW5kLWRyYWctb3Zlci1hbmNob3ItdG8tc2VsZWN0Lmh0bWwgYi9MYXlvdXRU ZXN0cy9lZGl0aW5nL21hYy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5j aG9yLXRvLXNlbGVjdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFmMTgzYTc2MzFlNDAwY2U5YzEwMmQyYjU3 MGNjMTJiZDljZmMyNTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL21h Yy9zZWxlY3Rpb24vZG91YmxlLWNsaWNrLWFuZC1kcmFnLW92ZXItYW5jaG9yLXRvLXNlbGVjdC5o dG1sCkBAIC0wLDAgKzEsNTIgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1 bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPGh0bWw+Cis8aGVhZD4KKzxt ZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwt c2NhbGU9MSI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3Vw LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK3AgeworICAgIGZvbnQtc2l6ZTogMjBweDsKK30KKwor cCArIHAgeworICAgIG1hcmdpbi10b3A6IDEwMHB4OworfQorCisjc3RhcnQgeworICAgIGJvcmRl cjogMXB4IHNvbGlkIGJsdWU7Cit9CisKKyNlbmQgeworICAgIHBhZGRpbmctcmlnaHQ6IDJweDsK KyAgICBib3JkZXI6IDFweCBzb2xpZCB0b21hdG87Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJv ZHk+Cis8ZGl2PlRoaXMgdGVzdCB2ZXJpZmllcyB0aGF0IGRvdWJsZS1jbGlja2luZyBhbmQgdGhl biBkcmFnZ2luZyBvdmVyIHRoZSBzZWxlY3Rpb24gYW5jaG9yIHBvaW50IChpbiBMVFIgbGFuZ3Vh Z2VzLCB0aGlzIGlzIGRyYWdnaW5nIGxlZnQpIHRvIGV4dGVuZCB0aGUgdGV4dCBzZWxlY3Rpb24g ZG9lcyBub3QgZXh0ZW5kIHRoZSBzZWxlY3Rpb24gZnJvbSB0aGUgb3JpZ2luYWwgc2VsZWN0aW9u IGZvY3VzIGFzIHdlbGwgKGluIExSVCBsYW5ndWFnZXMsIHRoZSBzZWxlY3Rpb24gc2hvdWxkIG5v dCBleHRlbnQgdG8gdGhlIHJpZ2h0IGFzIHdlbGwgd2hpbGUgZHJhZ2dpbmcgbGVmdCkuIFRvIHRl c3QgbWFudWFsbHksIGxvYWQgdGhlIHBhZ2UgYW5kIGRvdWJsZSBjbGljayBvbiAnb3ZlcicgYW5k IGRyYWcgdG8gJ3F1aWNrJy4gVGhlIHRleHQgJ3F1aWNrIGJyb3duIGZveCBqdW1wZWQgb3Zlcicg c2hvdWxkIGJlIHNlbGVjdGVkLCBhbmQgbm90aGluZyBlbHNlLjwvZGl2PgorPGRpdiBpZD0iY29u dGFpbmVyIj4KKyAgICA8cD5UaGUgPHNwYW4gaWQ9ImVuZCI+cXVpY2s8L3NwYW4+IDxzcGFuIGlk PSJtaWRkbGUzIj5icm93bjwvc3Bhbj4gPHNwYW4gaWQ9Im1pZGRsZTIiPmZveDwvc3Bhbj4gPHNw YW4gaWQ9Im1pZGRsZTEiPmp1bXBlZDwvc3Bhbj4gPHNwYW4gaWQ9InN0YXJ0Ij5vdmVyPC9zcGFu PiB0aGUgbGF6eSBkb2cuIEFuZCB0aGVuIHRoZXJlIHdhcyBhbm90aGVyIHNlbnRlbmNlLjwvcD4K KzwvZGl2PgorPHNjcmlwdD4KKworKGFzeW5jIGZ1bmN0aW9uICgpIHsKKyAgICBpZiAoIXdpbmRv dy50ZXN0UnVubmVyKQorICAgICAgICByZXR1cm47CisKKyAgICBpbnRlcm5hbHMuc2V0dGluZ3Mu c2V0RWRpdGluZ0JlaGF2aW9yKCJNYWMiKTsKKyAgICBNYXJrdXAuZHVtcChkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY29udGFpbmVyIiksICJCZWZvcmUgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb24i KTsKKworICAgIFVJSGVscGVyLmRvdWJsZUNsaWNrRWxlbWVudE1vdXNlRG93bihkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgic3RhcnQiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxl bWVudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWlkZGxlMSIpKTsKKyAgICBVSUhlbHBlci5k cmFnTW91c2VBY3Jvc3NFbGVtZW50KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtaWRkbGUyIikp OworICAgIFVJSGVscGVyLmRyYWdNb3VzZUFjcm9zc0VsZW1lbnQoZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoIm1pZGRsZTMiKSk7CisgICAgVUlIZWxwZXIuZHJhZ01vdXNlQWNyb3NzRWxlbWVudChk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZW5kIikpOworICAgIFVJSGVscGVyLm1vdXNlVXAoKTsK KworICAgIE1hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250YWluZXIiKSwg ZG9jdW1lbnQuZ2V0U2VsZWN0aW9uKCkudG9TdHJpbmcoKSk7CisgICAgTWFya3VwLm5vdGlmeURv bmUoKTsKK30pKCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0 IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVy LmpzIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwppbmRleCAyNTQ5M2VjYjhk MzMxMGUxZDliNzZlNDAwZTNjOGZmNzMxZmYyNThhLi42OWYwMjg2NTIyYjI3MGMyZDU2M2NjOTli ZjU1NmFhZTdjOWFkMjNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVs cGVyLmpzCisrKyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKQEAgLTE5LDYg KzE5LDE5IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgZXZl bnRTZW5kZXIubW91c2VVcCgpOwogICAgIH0KIAorICAgIHN0YXRpYyBkb3VibGVDbGlja0F0TW91 c2VEb3duKHgxLCB5MSkKKyAgICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgx LCB5MSk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICBldmVudFNl bmRlci5tb3VzZVVwKCk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIH0K KworICAgIHN0YXRpYyBtb3VzZVVwKCkKKyAgICB7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl VXAoKTsKKyAgICB9CisKICAgICBzdGF0aWMgZG91YmxlQ2xpY2tBdFRoZW5EcmFnVG8oeDEsIHkx LCB4MiwgeTIpCiAgICAgewogICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeTEp OwpAQCAtMjksNiArNDIsMjggQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewog ICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CiAgICAgfQogCisgICAgc3RhdGljIGRyYWdN b3VzZUFjcm9zc0VsZW1lbnQoZWxlbWVudCkKKyAgICB7CisgICAgICAgIGNvbnN0IHgxID0gZWxl bWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aDsKKyAgICAgICAgY29uc3QgeDIg PSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoICogLjc1OworICAgICAg ICBjb25zdCB4MyA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0V2lkdGggLyAy OworICAgICAgICBjb25zdCB4NCA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQub2Zmc2V0 V2lkdGggLyA0OworICAgICAgICBjb25zdCB4NSA9IGVsZW1lbnQub2Zmc2V0TGVmdDsKKyAgICAg ICAgY29uc3QgeSA9IGVsZW1lbnQub2Zmc2V0VG9wICsgZWxlbWVudC5vZmZzZXRIZWlnaHQgLyAy OworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4MSwgeSk7CisgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlTW92ZVRvKHgyLCB5KTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8oeDMsIHkpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4NCwgeSk7CisgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHg1LCB5KTsKKyAgICB9CisKKyAgICBzdGF0aWMg ZG91YmxlQ2xpY2tFbGVtZW50TW91c2VEb3duKGVsZW1lbnQxKQorICAgIHsKKyAgICAgICAgY29u c3QgeDEgPSBlbGVtZW50MS5vZmZzZXRMZWZ0ICsgZWxlbWVudDEub2Zmc2V0V2lkdGggLyAyOwor ICAgICAgICBjb25zdCB5MSA9IGVsZW1lbnQxLm9mZnNldFRvcCArIGVsZW1lbnQxLm9mZnNldEhl aWdodCAvIDI7CisgICAgICAgIHJldHVybiBVSUhlbHBlci5kb3VibGVDbGlja0F0TW91c2VEb3du KHgxLCB5MSk7CisgICAgfQorCiAgICAgc3RhdGljIGFzeW5jIG1vdmVNb3VzZUFuZFdhaXRGb3JG cmFtZSh4LCB5KQogICAgIHsKICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7 Cg==