236413 2022-02-09 16:21:59 -0800 [LFC][IFC] Adjust bidi (and mostly RTL) coords to support vertical writing mode 2022-02-10 13:11:18 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1839444 0 zalan 2022-02-09 16:21:59 -0800 ssia 1839450 1 451458 zalan 2022-02-09 16:31:22 -0800 Created attachment 451458 Patch 1839728 2 451552 zalan 2022-02-10 09:38:18 -0800 Created attachment 451552 Patch 1839735 3 451554 zalan 2022-02-10 09:44:48 -0800 Created attachment 451554 [fast-cq]Patch 1839885 4 ews-feeder 2022-02-10 13:10:38 -0800 Committed r289572 (247089@main): <https://commits.webkit.org/247089@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451554. 1839886 5 webkit-bug-importer 2022-02-10 13:11:18 -0800 <rdar://problem/88774069> 451458 2022-02-09 16:31:22 -0800 2022-02-10 09:38:16 -0800 Patch bug-236413-20220209163121.patch text/plain 13242 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQ1Y2ZmM2ZiZGM4MmNl N2YwZmY5ODQ4MmRlNTVjNGM5NDRiMDNkYS4uMjA3OTQwMzk2MDg3NmI2M2IzZTNjNmMwOWE1OTk4 YjViMGUyYzdlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkanVzdCBi aWRpIChhbmQgbW9zdGx5IFJUTCkgY29vcmRzIHRvIHN1cHBvcnQgdmVydGljYWwgd3JpdGluZyBt b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0 MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg bW9yZSBjb29yZGluYXRlIGZsaXBzIHRvIHRoZSBiaWRpIGNvZGVwYXRoIHRvIHN1cHBvcnQgdmVy dGljYWwgd3JpdGluZyBtb2RlLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVEaXNwbGF5OjpCb3g6OnNldFJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURp c3BsYXk6OkJveDo6c2V0VG9wKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkJv eDo6c2V0Qm90dG9tKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2Vv bWV0cnlGb3JEaXNwbGF5Qm94KTogQ29udmVydCAiaW5saW5lIGRpcmVjdGlvbiB2aXN1YWwsIGJ1 dCB3cml0aW5nIG1vZGUgbG9naWNhbCIgY29vcmRpbmF0ZXMgdG8gZmluYWwuCisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlD b250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnNldFJpZ2h0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisKIDIwMjItMDItMDkgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUHJlcGFyZSBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCBmb3Igc3Vw cG9ydGluZyB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJv eC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKaW5kZXggODNkODgzYmQ2MDFhM2IxNTBlNzI4YmU1MmM5 MWRiMjkxZTUzMzdjNy4uYTJiYzE4YzFmNGRmNjljNWZmNTljOTA3NGZiNjY0OWM4ZDhjY2FjNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKQEAg LTEzMSw3ICsxMzEsMTkgQEAgc3RydWN0IEJveCB7CiAgICAgewogICAgICAgICBhdXRvIG9mZnNl dCA9IHBoeXNpY2FsUmlnaHQgLSByaWdodCgpOwogICAgICAgICBtX3BoeXNpY2FsUmVjdC5zaGlm dE1heFhFZGdlVG8ocGh5c2ljYWxSaWdodCk7Ci0gICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRN YXhYRWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKKyAgICAgICAgbV9pbmtP dmVyZmxvdy5zaGlmdE1heFhFZGdlVG8obV9pbmtPdmVyZmxvdy5tYXhYKCkgKyBvZmZzZXQpOwor ICAgIH0KKyAgICB2b2lkIHNldFRvcChmbG9hdCBwaHlzaWNhbFRvcCkKKyAgICB7CisgICAgICAg IGF1dG8gb2Zmc2V0ID0gcGh5c2ljYWxUb3AgLSB0b3AoKTsKKyAgICAgICAgbV9waHlzaWNhbFJl Y3Quc2V0WShwaHlzaWNhbFRvcCk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZRWRn ZVRvKG1faW5rT3ZlcmZsb3cueSgpICsgb2Zmc2V0KTsKKyAgICB9CisgICAgdm9pZCBzZXRCb3R0 b20oZmxvYXQgcGh5c2ljYWxCb3R0b20pCisgICAgeworICAgICAgICBhdXRvIG9mZnNldCA9IHBo eXNpY2FsQm90dG9tIC0gYm90dG9tKCk7CisgICAgICAgIG1fcGh5c2ljYWxSZWN0LnNoaWZ0TWF4 WUVkZ2VUbyhwaHlzaWNhbEJvdHRvbSk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZ RWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKICAgICB9CiAgICAgdm9pZCBz ZXRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxv dykKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggZmE1YTQxMGEyNjAwYjU1YjQzYjRm ZGVmMzk4MDMwNWZhYjM1M2ZkNS4uNmY3MWU5M2Q1MTY1OTRmMDkwOWRmMTZkODc3NWE5NDdhZWVh YjY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNDYxLDYgKzQ2MSw4IEBAIHN0cnVjdCBJ c0ZpcnN0TGFzdEluZGV4IHsKIHVzaW5nIElzRmlyc3RMYXN0SW5kZXhlc01hcCA9IEhhc2hNYXA8 Y29uc3QgQm94KiwgSXNGaXJzdExhc3RJbmRleD47CiB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbGF5 Qm94Tm9kZUluZGV4LCBJbmxpbmVMYXlvdXRVbml0JiBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hUb3AsIGNvbnN0IERpc3Bs YXlCb3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGlu ZUJveCYgbGluZUJveCwgY29uc3QgSXNGaXJzdExhc3RJbmRleGVzTWFwJiBpc0ZpcnN0TGFzdElu ZGV4ZXNNYXApCiB7CisgICAgYXV0byB3cml0aW5nTW9kZSA9IHJvb3QoKS5zdHlsZSgpLndyaXRp bmdNb2RlKCk7CisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IFdlYkNvcmU6Omlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKTsKICAgICAvLyBOb24taW5saW5lIGJv eCBkaXNwbGF5IGJveGVzIGp1c3QgbmVlZCBhIGhvcml6b250YWwgYWRqdXN0bWVudCB3aGlsZQog ICAgIC8vIGlubGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzIG5lZWQKICAgICAvLyAxLiBo b3Jpem9udGFsIGFkanVzdG1lbnQgYW5kIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBzdGFydCBvZmZz ZXR0aW5nIG9uIHRoZSBmaXJzdCBib3gKQEAgLTQ3NiwxMyArNDc4LDEzIEBAIHZvaWQgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3go c2l6ZV90IGRpc3BsCiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TGVmdCA9IExheW91dFVu aXQgeyBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICsgYm94TWFyZ2lu TGVmdCB9OwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbExlZnQoYm9yZGVyQm94 TGVmdCk7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoYm9yZGVyQm94TGVmdCk7Cisg ICAgICAgICAgICBzZXRMZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgYm9yZGVyQm94TGVm dCwgd3JpdGluZ01vZGUpOwogCiAgICAgICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyICs9IGJveEdlb21ldHJ5Lm1hcmdpbkJveFdpZHRoKCk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBhdXRvIHdvcmRTcGFjaW5nTWFyZ2luID0gZGlzcGxheUJv eC5pc1dvcmRTZXBhcmF0b3IoKSA/IGxheW91dEJveC5zdHlsZSgpLmZvbnRDYXNjYWRlKCkud29y ZFNwYWNpbmcoKSA6IDAuMGY7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoY29udGVu dFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luKTsK LSAgICAgICAgICAgIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIgKz0g ZGlzcGxheUJveC53aWR0aCgpICsgd29yZFNwYWNpbmdNYXJnaW47CisgICAgICAgICAgICBzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rp b25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luLCB3cml0aW5nTW9kZSk7CisgICAgICAg ICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICs9IChpc0hvcml6 b250YWxXcml0aW5nTW9kZSA/IGRpc3BsYXlCb3gud2lkdGgoKSA6IGRpc3BsYXlCb3guaGVpZ2h0 KCkpICsgd29yZFNwYWNpbmdNYXJnaW47CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTQ5NCwxNSArNDk2LDE1IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsCiAgICAgYXV0 byBpc0xhc3RCb3ggPSBpc0ZpcnN0TGFzdEluZGV4ZXMubGFzdCAmJiAqaXNGaXJzdExhc3RJbmRl eGVzLmxhc3QgPT0gZGlzcGxheUJveE5vZGVJbmRleDsKICAgICBhdXRvIGJlZm9yZUlubGluZUJv eENvbnRlbnQgPSBbJl0gewogICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dp Y2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAg ICBhdXRvIHZpc3VhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUJveFRvcCArIGxvZ2ljYWxSZWN0 LnRvcCgpLCBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyLCB7IH0sIGxv Z2ljYWxSZWN0LmhlaWdodCgpIH07CisgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZsaXBMb2dp Y2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoeyBsaW5lQm94VG9wICsgbG9naWNhbFJlY3Qu dG9wKCksIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIsIHsgfSwgbG9n aWNhbFJlY3QuaGVpZ2h0KCkgfSwgd3JpdGluZ01vZGUpOworICAgICAgICBkaXNwbGF5Qm94LnNl dFJlY3QodmlzdWFsUmVjdCwgdmlzdWFsUmVjdCk7CisKICAgICAgICAgYXV0byBzaG91bGRBcHBs eUxlZnRTaWRlID0gKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gJiYgaXNGaXJzdEJveCkgfHwgKCFp c0xlZnRUb1JpZ2h0RGlyZWN0aW9uICYmIGlzTGFzdEJveCk7CiAgICAgICAgIGlmICghc2hvdWxk QXBwbHlMZWZ0U2lkZSkKLSAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnNldFJlY3Qodmlz dWFsUmVjdCwgdmlzdWFsUmVjdCk7CisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgY29u dGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArPSBtYXJnaW5MZWZ0SW5Jbmxp bmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOwotICAgICAg ICBhdXRvIHZpc3VhbFJlY3RXaXRoTWFyZ2luTGVmdCA9IHZpc3VhbFJlY3Q7Ci0gICAgICAgIHZp c3VhbFJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVy KTsKLSAgICAgICAgZGlzcGxheUJveC5zZXRSZWN0KHZpc3VhbFJlY3RXaXRoTWFyZ2luTGVmdCwg dmlzdWFsUmVjdFdpdGhNYXJnaW5MZWZ0KTsKKyAgICAgICAgc2V0TGVmdEZvcldyaXRpbmdNb2Rl KGRpc3BsYXlCb3gsIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIsIHdy aXRpbmdNb2RlKTsKICAgICAgICAgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxP cmRlciArPSBib3JkZXJMZWZ0SW5JbmxpbmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlzTGVmdFRv UmlnaHREaXJlY3Rpb24pICsgcGFkZGluZ0xlZnRJbklubGluZURpcmVjdGlvbihib3hHZW9tZXRy eSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbik7CiAgICAgfTsKICAgICBiZWZvcmVJbmxpbmVCb3hD b250ZW50KCk7CkBAIC01MTMsMTAgKzUxNSwxMCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAog ICAgIGF1dG8gYWZ0ZXJJbmxpbmVCb3hDb250ZW50ID0gWyZdIHsKICAgICAgICAgYXV0byBzaG91 bGRBcHBseVJpZ2h0U2lkZSA9IChpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uICYmIGlzTGFzdEJveCkg fHwgKCFpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uICYmIGlzRmlyc3RCb3gpOwogICAgICAgICBpZiAo IXNob3VsZEFwcGx5UmlnaHRTaWRlKQotICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3guc2V0 UmlnaHQoY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlcik7CisgICAgICAg ICAgICByZXR1cm4gc2V0UmlnaHRGb3JXcml0aW5nTW9kZShkaXNwbGF5Qm94LCBjb250ZW50Umln aHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyLCB3cml0aW5nTW9kZSk7CiAKICAgICAgICAg Y29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArPSBib3JkZXJSaWdodElu SW5saW5lRGlyZWN0aW9uKGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKSArIHBh ZGRpbmdSaWdodEluSW5saW5lRGlyZWN0aW9uKGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKTsKLSAgICAgICAgZGlzcGxheUJveC5zZXRSaWdodChjb250ZW50UmlnaHRJbklubGlu ZURpcmVjdGlvblZpc3VhbE9yZGVyKTsKKyAgICAgICAgc2V0UmlnaHRGb3JXcml0aW5nTW9kZShk aXNwbGF5Qm94LCBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyLCB3cml0 aW5nTW9kZSk7CiAgICAgICAgIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3Jk ZXIgKz0gbWFyZ2luUmlnaHRJbklubGluZURpcmVjdGlvbihib3hHZW9tZXRyeSwgaXNMZWZ0VG9S aWdodERpcmVjdGlvbik7CiAgICAgfTsKICAgICBhZnRlcklubGluZUJveENvbnRlbnQoKTsKQEAg LTU0Miw3ICs1NDQsOCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vz c0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgIGFuY2VzdG9yU3Rh Y2sucHVzaCh7IH0sIHJvb3QoKSk7CiAKICAgICBhdXRvIHdyaXRpbmdNb2RlID0gcm9vdCgpLnN0 eWxlKCkud3JpdGluZ01vZGUoKTsKLSAgICBhdXRvIGNvbnRlbnRTdGFydEluSW5saW5lRGlyZWN0 aW9uVmlzdWFsT3JkZXIgPSAoV2ViQ29yZTo6aXNIb3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGlu Z01vZGUpID8gZGlzcGxheUxpbmUubGVmdCgpIDogZGlzcGxheUxpbmUudG9wKCkpICsgZGlzcGxh eUxpbmUuY29udGVudExvZ2ljYWxPZmZzZXQoKTsKKyAgICBhdXRvIGlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlID0gV2ViQ29yZTo6aXNIb3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGluZ01vZGUpOwor ICAgIGF1dG8gY29udGVudFN0YXJ0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciA9IChpc0hv cml6b250YWxXcml0aW5nTW9kZSA/IGRpc3BsYXlMaW5lLmxlZnQoKSA6IGRpc3BsYXlMaW5lLnRv cCgpKSArIGRpc3BsYXlMaW5lLmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCk7CiAgICAgYXV0byBoYXNJ bmxpbmVCb3ggPSBmYWxzZTsKICAgICBhdXRvIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3Jk ZXIgPSBbJl0gewogCkBAIC01NjAsMTEgKzU2MywxMyBAQCB2b2lkIElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29u dAogCiAgICAgICAgICAgICBhdXRvIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRv IGxvZ2ljYWxSZWN0KSB7CiAgICAgICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExv Z2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZVdpdGhpbkxpbmUobG9naWNhbFJlY3QsIGxp bmVCb3gubG9naWNhbFJlY3QoKSwgd3JpdGluZ01vZGUpOwotICAgICAgICAgICAgICAgIGlmIChX ZWJDb3JlOjppc0hvcml6b250YWxXcml0aW5nTW9kZSh3cml0aW5nTW9kZSkpCisgICAgICAgICAg ICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSB7CiAgICAgICAgICAgICAgICAgICAg IHZpc3VhbFJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9y ZGVyKTsKLSAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHZpc3VhbFJl Y3QubW92ZVZlcnRpY2FsbHkoZGlzcGxheUxpbmUudG9wKCkpOworICAgICAgICAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIHZpc3VhbFJlY3Quc2V0VG9wKGNvbnRlbnRSaWdo dEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIpOwotICAgICAgICAgICAgICAgIHZpc3VhbFJl Y3QubW92ZVZlcnRpY2FsbHkoZGlzcGxheUxpbmUudG9wKCkpOworICAgICAgICAgICAgICAgICAg ICB2aXN1YWxSZWN0Lm1vdmVIb3Jpem9udGFsbHkoZGlzcGxheUxpbmUubGVmdCgpKTsKKyAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmV0dXJuIHZpc3VhbFJlY3Q7CiAgICAgICAg ICAgICB9OwogCkBAIC04MDAsNiArODA1LDIyIEBAIElubGluZVJlY3QgSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlV2l0CiAg ICAgcmV0dXJuIGxvZ2ljYWxSZWN0OwogfQogCitJbmxpbmVSZWN0IElubGluZURpc3BsYXlDb250 ZW50QnVpbGRlcjo6ZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJ bmxpbmVSZWN0JiBsb2dpY2FsUmVjdCwgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUpIGNvbnN0Cit7 CisgICAgc3dpdGNoICh3cml0aW5nTW9kZSkgeworICAgIGNhc2UgV3JpdGluZ01vZGU6OlRvcFRv Qm90dG9tOgorICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgY2FzZSBXcml0aW5nTW9k ZTo6TGVmdFRvUmlnaHQ6CisgICAgY2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6CisgICAg ICAgIC8vIFNlZSBJbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkgZm9yIG1vcmUgaW5mby4KKyAgICAg ICAgcmV0dXJuIHsgbG9naWNhbFJlY3QubGVmdCgpLCBsb2dpY2FsUmVjdC50b3AoKSwgbG9naWNh bFJlY3QuaGVpZ2h0KCksIGxvZ2ljYWxSZWN0LndpZHRoKCkgfTsKKyAgICBkZWZhdWx0OgorICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIHJl dHVybiBsb2dpY2FsUmVjdDsKK30KKwogSW5saW5lUmVjdCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1 aWxkZXI6OmZsaXBSb290SW5saW5lQm94UmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoY29uc3Qg SW5saW5lUmVjdCYgcm9vdElubGluZUJveExvZ2ljYWxSZWN0LCBjb25zdCBJbmxpbmVEaXNwbGF5 OjpMaW5lJiBkaXNwbGF5TGluZSwgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUpIGNvbnN0CiB7CiAg ICAgc3dpdGNoICh3cml0aW5nTW9kZSkgewpAQCAtODIyLDYgKzg0MywzOCBAQCBJbmxpbmVSZWN0 IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZmxpcFJvb3RJbmxpbmVCb3hSZWN0VG9WaXN1 YWxGb3JXcml0aW5nTQogICAgIHJldHVybiByb290SW5saW5lQm94TG9naWNhbFJlY3Q7CiB9CiAK K3ZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpzZXRMZWZ0Rm9yV3JpdGluZ01vZGUo SW5saW5lRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0LCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHdyaXRp bmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b206CisgICAgICAgIGRp c3BsYXlCb3guc2V0TGVmdChsb2dpY2FsTGVmdCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug V3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0OgorICAgIGNhc2UgV3JpdGluZ01vZGU6OlJpZ2h0VG9M ZWZ0OgorICAgICAgICBkaXNwbGF5Qm94LnNldFRvcChsb2dpY2FsTGVmdCk7CisgICAgICAgIGJy ZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAg ICBicmVhazsKKyAgICB9Cit9CisKK3ZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpz ZXRSaWdodEZvcldyaXRpbmdNb2RlKElubGluZURpc3BsYXk6OkJveCYgZGlzcGxheUJveCwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsUmlnaHQsIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlKSBjb25z dAoreworICAgIHN3aXRjaCAod3JpdGluZ01vZGUpIHsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpU b3BUb0JvdHRvbToKKyAgICAgICAgZGlzcGxheUJveC5zZXRSaWdodChsb2dpY2FsUmlnaHQpOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpMZWZ0VG9SaWdodDoKKyAgICBj YXNlIFdyaXRpbmdNb2RlOjpSaWdodFRvTGVmdDoKKyAgICAgICAgZGlzcGxheUJveC5zZXRCb3R0 b20obG9naWNhbFJpZ2h0KTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwogSW5saW5l TGF5b3V0UG9pbnQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjptb3ZlUG9pbnRIb3Jpem9u dGFsbHlGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFBvaW50 LCBJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxPZmZzZXQsIFdyaXRpbmdNb2RlIHdyaXRpbmdN b2RlKSBjb25zdAogewogICAgIGF1dG8gdmlzdWFsUG9pbnQgPSBsb2dpY2FsUG9pbnQ7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9k aXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXIuaAppbmRleCAzNDlkMTUzZjJhYWViZWUyZDdkZjA0OGYxZGZhZWIwOWM5MzhmOWQ4 Li41ZTZlOGU3ZTMwZjI0ZjNjYzIwZTRkZjFkYzMxYmZiOTJjOWE2MzIyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyLmgKQEAgLTY3LDcgKzY3LDEwIEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IGVuc3VyZURpc3Bs YXlCb3hGb3JDb250YWluZXIoY29uc3QgQ29udGFpbmVyQm94JiwgRGlzcGxheUJveFRyZWUmLCBB bmNlc3RvclN0YWNrJiwgRGlzcGxheUJveGVzJik7CiAKICAgICBJbmxpbmVSZWN0IGZsaXBMb2dp Y2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRoaW5MaW5lKGNvbnN0IElubGluZVJlY3Qm IGxvZ2ljYWxSZWN0LCBjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNhbFJlY3QsIFdyaXRpbmdN b2RlKSBjb25zdDsKKyAgICBJbmxpbmVSZWN0IGZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3Jp dGluZ01vZGUoY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QsIFdyaXRpbmdNb2RlKSBjb25z dDsKICAgICBJbmxpbmVSZWN0IGZsaXBSb290SW5saW5lQm94UmVjdFRvVmlzdWFsRm9yV3JpdGlu Z01vZGUoY29uc3QgSW5saW5lUmVjdCYgcm9vdElubGluZUJveExvZ2ljYWxSZWN0LCBjb25zdCBJ bmxpbmVEaXNwbGF5OjpMaW5lJiwgV3JpdGluZ01vZGUpIGNvbnN0OworICAgIHZvaWQgc2V0TGVm dEZvcldyaXRpbmdNb2RlKElubGluZURpc3BsYXk6OkJveCYsIElubGluZUxheW91dFVuaXQgbG9n aWNhbFJpZ2h0LCBXcml0aW5nTW9kZSkgY29uc3Q7CisgICAgdm9pZCBzZXRSaWdodEZvcldyaXRp bmdNb2RlKElubGluZURpc3BsYXk6OkJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFJpZ2h0 LCBXcml0aW5nTW9kZSkgY29uc3Q7CiAgICAgSW5saW5lTGF5b3V0UG9pbnQgbW92ZVBvaW50SG9y aXpvbnRhbGx5Rm9yV3JpdGluZ01vZGUoY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIHRvcExlZnQs IElubGluZUxheW91dFVuaXQgaG9yaXpvbnRhbE9mZnNldCwgV3JpdGluZ01vZGUpIGNvbnN0Owog CiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9mb3JtYXR0 aW5nQ29udGV4dFJvb3Q7IH0K 451552 2022-02-10 09:38:18 -0800 2022-02-10 09:57:35 -0800 Patch bug-236413-20220210093817.patch text/plain 13357 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdjNjI1NWI3YTUzZDY4 NDg2NTE3NWM4M2ZhNzczZTJkMDMxMTBkYS4uMjdkN2M0MTQ5M2Y3MGUzZTE3NGQ0Zjc0OTk2NWFk NDdkYjM1N2UwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTEwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkanVzdCBi aWRpIChhbmQgbW9zdGx5IFJUTCkgY29vcmRzIHRvIHN1cHBvcnQgdmVydGljYWwgd3JpdGluZyBt b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0 MTMKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBBZGQg bW9yZSBjb29yZGluYXRlIGZsaXBzIHRvIHRoZSBiaWRpIGNvZGVwYXRoIHRvIHN1cHBvcnQgdmVy dGljYWwgd3JpdGluZyBtb2RlLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVEaXNwbGF5OjpCb3g6OnNldFJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURp c3BsYXk6OkJveDo6c2V0VG9wKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkJv eDo6c2V0Qm90dG9tKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2Vv bWV0cnlGb3JEaXNwbGF5Qm94KTogQ29udmVydCAiaW5saW5lIGRpcmVjdGlvbiB2aXN1YWwsIGJ1 dCB3cml0aW5nIG1vZGUgbG9naWNhbCIgY29vcmRpbmF0ZXMgdG8gZmluYWwuCisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlD b250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnNldFJpZ2h0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisKIDIwMjItMDItMTAgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUHJlcGFyZSBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCBmb3Igc3Vw cG9ydGluZyB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJv eC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKaW5kZXggODNkODgzYmQ2MDFhM2IxNTBlNzI4YmU1MmM5 MWRiMjkxZTUzMzdjNy4uYTJiYzE4YzFmNGRmNjljNWZmNTljOTA3NGZiNjY0OWM4ZDhjY2FjNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKQEAg LTEzMSw3ICsxMzEsMTkgQEAgc3RydWN0IEJveCB7CiAgICAgewogICAgICAgICBhdXRvIG9mZnNl dCA9IHBoeXNpY2FsUmlnaHQgLSByaWdodCgpOwogICAgICAgICBtX3BoeXNpY2FsUmVjdC5zaGlm dE1heFhFZGdlVG8ocGh5c2ljYWxSaWdodCk7Ci0gICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRN YXhYRWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKKyAgICAgICAgbV9pbmtP dmVyZmxvdy5zaGlmdE1heFhFZGdlVG8obV9pbmtPdmVyZmxvdy5tYXhYKCkgKyBvZmZzZXQpOwor ICAgIH0KKyAgICB2b2lkIHNldFRvcChmbG9hdCBwaHlzaWNhbFRvcCkKKyAgICB7CisgICAgICAg IGF1dG8gb2Zmc2V0ID0gcGh5c2ljYWxUb3AgLSB0b3AoKTsKKyAgICAgICAgbV9waHlzaWNhbFJl Y3Quc2V0WShwaHlzaWNhbFRvcCk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZRWRn ZVRvKG1faW5rT3ZlcmZsb3cueSgpICsgb2Zmc2V0KTsKKyAgICB9CisgICAgdm9pZCBzZXRCb3R0 b20oZmxvYXQgcGh5c2ljYWxCb3R0b20pCisgICAgeworICAgICAgICBhdXRvIG9mZnNldCA9IHBo eXNpY2FsQm90dG9tIC0gYm90dG9tKCk7CisgICAgICAgIG1fcGh5c2ljYWxSZWN0LnNoaWZ0TWF4 WUVkZ2VUbyhwaHlzaWNhbEJvdHRvbSk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZ RWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKICAgICB9CiAgICAgdm9pZCBz ZXRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxv dykKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggZTM4NzM2ZmM0ZDA1OWM3NWZmODNh ZGJjZjU5ZjA5ZjVjZWNkODQxNi4uN2ZlOGE5MjFjMWUxYWE5ODI4ZjRkYWJlM2EyMjg0NmMyM2Qw NjAzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNDYxLDYgKzQ2MSw4IEBAIHN0cnVjdCBJ c0ZpcnN0TGFzdEluZGV4IHsKIHVzaW5nIElzRmlyc3RMYXN0SW5kZXhlc01hcCA9IEhhc2hNYXA8 Y29uc3QgQm94KiwgSXNGaXJzdExhc3RJbmRleD47CiB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbGF5 Qm94Tm9kZUluZGV4LCBJbmxpbmVMYXlvdXRVbml0JiBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hUb3AsIGNvbnN0IERpc3Bs YXlCb3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGlu ZUJveCYgbGluZUJveCwgY29uc3QgSXNGaXJzdExhc3RJbmRleGVzTWFwJiBpc0ZpcnN0TGFzdElu ZGV4ZXNNYXApCiB7CisgICAgYXV0byB3cml0aW5nTW9kZSA9IHJvb3QoKS5zdHlsZSgpLndyaXRp bmdNb2RlKCk7CisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IFdlYkNvcmU6Omlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKTsKICAgICAvLyBOb24taW5saW5lIGJv eCBkaXNwbGF5IGJveGVzIGp1c3QgbmVlZCBhIGhvcml6b250YWwgYWRqdXN0bWVudCB3aGlsZQog ICAgIC8vIGlubGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzIG5lZWQKICAgICAvLyAxLiBo b3Jpem9udGFsIGFkanVzdG1lbnQgYW5kIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBzdGFydCBvZmZz ZXR0aW5nIG9uIHRoZSBmaXJzdCBib3gKQEAgLTQ3NiwxMyArNDc4LDEzIEBAIHZvaWQgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3go c2l6ZV90IGRpc3BsCiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TGVmdCA9IExheW91dFVu aXQgeyBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICsgYm94TWFyZ2lu TGVmdCB9OwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbExlZnQoYm9yZGVyQm94 TGVmdCk7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoYm9yZGVyQm94TGVmdCk7Cisg ICAgICAgICAgICBzZXRMZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgYm9yZGVyQm94TGVm dCwgd3JpdGluZ01vZGUpOwogCiAgICAgICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyICs9IGJveEdlb21ldHJ5Lm1hcmdpbkJveFdpZHRoKCk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBhdXRvIHdvcmRTcGFjaW5nTWFyZ2luID0gZGlzcGxheUJv eC5pc1dvcmRTZXBhcmF0b3IoKSA/IGxheW91dEJveC5zdHlsZSgpLmZvbnRDYXNjYWRlKCkud29y ZFNwYWNpbmcoKSA6IDAuMGY7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoY29udGVu dFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luKTsK LSAgICAgICAgICAgIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIgKz0g ZGlzcGxheUJveC53aWR0aCgpICsgd29yZFNwYWNpbmdNYXJnaW47CisgICAgICAgICAgICBzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rp b25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luLCB3cml0aW5nTW9kZSk7CisgICAgICAg ICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICs9IChpc0hvcml6 b250YWxXcml0aW5nTW9kZSA/IGRpc3BsYXlCb3gud2lkdGgoKSA6IGRpc3BsYXlCb3guaGVpZ2h0 KCkpICsgd29yZFNwYWNpbmdNYXJnaW47CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTQ5MywxNiArNDk1LDE1IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsCiAgICAgYXV0 byBpc0ZpcnN0Qm94ID0gaXNGaXJzdExhc3RJbmRleGVzLmZpcnN0ICYmICppc0ZpcnN0TGFzdElu ZGV4ZXMuZmlyc3QgPT0gZGlzcGxheUJveE5vZGVJbmRleDsKICAgICBhdXRvIGlzTGFzdEJveCA9 IGlzRmlyc3RMYXN0SW5kZXhlcy5sYXN0ICYmICppc0ZpcnN0TGFzdEluZGV4ZXMubGFzdCA9PSBk aXNwbGF5Qm94Tm9kZUluZGV4OwogICAgIGF1dG8gYmVmb3JlSW5saW5lQm94Q29udGVudCA9IFsm XSB7Ci0gICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hG b3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7Ci0gICAgICAgIGF1dG8gdmlzdWFs UmVjdCA9IElubGluZVJlY3QgeyBsaW5lQm94VG9wICsgbG9naWNhbFJlY3QudG9wKCksIGNvbnRl bnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIsIHsgfSwgbG9naWNhbFJlY3QuaGVp Z2h0KCkgfTsKKyAgICAgICAgYXV0byB2aXN1YWxSZWN0ID0gZmxpcExvZ2ljYWxSZWN0VG9WaXN1 YWxGb3JXcml0aW5nTW9kZSh7IGxpbmVCb3hUb3AgKyBsb2dpY2FsUmVjdC50b3AoKSwgY29udGVu dFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciwgeyB9LCBsb2dpY2FsUmVjdC5oZWln aHQoKSB9LCB3cml0aW5nTW9kZSk7CisgICAgICAgIGRpc3BsYXlCb3guc2V0UmVjdCh2aXN1YWxS ZWN0LCB2aXN1YWxSZWN0KTsKKwogICAgICAgICBhdXRvIHNob3VsZEFwcGx5TGVmdFNpZGUgPSAo aXNMZWZ0VG9SaWdodERpcmVjdGlvbiAmJiBpc0ZpcnN0Qm94KSB8fCAoIWlzTGVmdFRvUmlnaHRE aXJlY3Rpb24gJiYgaXNMYXN0Qm94KTsKICAgICAgICAgaWYgKCFzaG91bGRBcHBseUxlZnRTaWRl KQotICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3guc2V0UmVjdCh2aXN1YWxSZWN0LCB2aXN1 YWxSZWN0KTsKKyAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBjb250ZW50UmlnaHRJbklu bGluZURpcmVjdGlvblZpc3VhbE9yZGVyICs9IG1hcmdpbkxlZnRJbklubGluZURpcmVjdGlvbihi b3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbik7Ci0gICAgICAgIGF1dG8gdmlzdWFs UmVjdFdpdGhNYXJnaW5MZWZ0ID0gdmlzdWFsUmVjdDsKLSAgICAgICAgdmlzdWFsUmVjdFdpdGhN YXJnaW5MZWZ0LnNldExlZnQoY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRl cik7Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0UmVjdCh2aXN1YWxSZWN0V2l0aE1hcmdpbkxlZnQs IHZpc3VhbFJlY3RXaXRoTWFyZ2luTGVmdCk7CisgICAgICAgIHNldExlZnRGb3JXcml0aW5nTW9k ZShkaXNwbGF5Qm94LCBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyLCB3 cml0aW5nTW9kZSk7CiAgICAgICAgIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFs T3JkZXIgKz0gYm9yZGVyTGVmdEluSW5saW5lRGlyZWN0aW9uKGJveEdlb21ldHJ5LCBpc0xlZnRU b1JpZ2h0RGlyZWN0aW9uKSArIHBhZGRpbmdMZWZ0SW5JbmxpbmVEaXJlY3Rpb24oYm94R2VvbWV0 cnksIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOwogICAgIH07CiAgICAgYmVmb3JlSW5saW5lQm94 Q29udGVudCgpOwpAQCAtNTEzLDEwICs1MTQsMTAgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChzaXplX3QgZGlzcGwK ICAgICBhdXRvIGFmdGVySW5saW5lQm94Q29udGVudCA9IFsmXSB7CiAgICAgICAgIGF1dG8gc2hv dWxkQXBwbHlSaWdodFNpZGUgPSAoaXNMZWZ0VG9SaWdodERpcmVjdGlvbiAmJiBpc0xhc3RCb3gp IHx8ICghaXNMZWZ0VG9SaWdodERpcmVjdGlvbiAmJiBpc0ZpcnN0Qm94KTsKICAgICAgICAgaWYg KCFzaG91bGRBcHBseVJpZ2h0U2lkZSkKLSAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnNl dFJpZ2h0KGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIpOworICAgICAg ICAgICAgcmV0dXJuIHNldFJpZ2h0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgY29udGVudFJp Z2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciwgd3JpdGluZ01vZGUpOwogCiAgICAgICAg IGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIgKz0gYm9yZGVyUmlnaHRJ bklubGluZURpcmVjdGlvbihib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikgKyBw YWRkaW5nUmlnaHRJbklubGluZURpcmVjdGlvbihib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERp cmVjdGlvbik7Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0UmlnaHQoY29udGVudFJpZ2h0SW5Jbmxp bmVEaXJlY3Rpb25WaXN1YWxPcmRlcik7CisgICAgICAgIHNldFJpZ2h0Rm9yV3JpdGluZ01vZGUo ZGlzcGxheUJveCwgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciwgd3Jp dGluZ01vZGUpOwogICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9y ZGVyICs9IG1hcmdpblJpZ2h0SW5JbmxpbmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlzTGVmdFRv UmlnaHREaXJlY3Rpb24pOwogICAgIH07CiAgICAgYWZ0ZXJJbmxpbmVCb3hDb250ZW50KCk7CkBA IC01NDIsNyArNTQzLDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nl c3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICBhbmNlc3RvclN0 YWNrLnB1c2goeyB9LCByb290KCkpOwogCiAgICAgYXV0byB3cml0aW5nTW9kZSA9IHJvb3QoKS5z dHlsZSgpLndyaXRpbmdNb2RlKCk7Ci0gICAgYXV0byBjb250ZW50U3RhcnRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyID0gKFdlYkNvcmU6OmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRp bmdNb2RlKSA/IGRpc3BsYXlMaW5lLmxlZnQoKSA6IGRpc3BsYXlMaW5lLnRvcCgpKSArIGRpc3Bs YXlMaW5lLmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCk7CisgICAgYXV0byBpc0hvcml6b250YWxXcml0 aW5nTW9kZSA9IFdlYkNvcmU6OmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKTsK KyAgICBhdXRvIGNvbnRlbnRTdGFydEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIgPSAoaXNI b3Jpem9udGFsV3JpdGluZ01vZGUgPyBkaXNwbGF5TGluZS5sZWZ0KCkgOiBkaXNwbGF5TGluZS50 b3AoKSkgKyBkaXNwbGF5TGluZS5jb250ZW50TG9naWNhbE9mZnNldCgpOwogICAgIGF1dG8gaGFz SW5saW5lQm94ID0gZmFsc2U7CiAgICAgYXV0byBjcmVhdGVEaXNwbGF5Qm94ZXNJblZpc3VhbE9y ZGVyID0gWyZdIHsKIApAQCAtNTYwLDExICs1NjIsMTMgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNv bnQKIAogICAgICAgICAgICAgYXV0byB2aXN1YWxSZWN0UmVsYXRpdmVUb1Jvb3QgPSBbJl0oYXV0 byBsb2dpY2FsUmVjdCkgewogICAgICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZsaXBM b2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRoaW5MaW5lKGxvZ2ljYWxSZWN0LCBs aW5lQm94LmxvZ2ljYWxSZWN0KCksIHdyaXRpbmdNb2RlKTsKLSAgICAgICAgICAgICAgICBpZiAo V2ViQ29yZTo6aXNIb3Jpem9udGFsV3JpdGluZ01vZGUod3JpdGluZ01vZGUpKQorICAgICAgICAg ICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSkgewogICAgICAgICAgICAgICAgICAg ICB2aXN1YWxSZWN0LnNldExlZnQoY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxP cmRlcik7Ci0gICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2aXN1YWxS ZWN0Lm1vdmVWZXJ0aWNhbGx5KGRpc3BsYXlMaW5lLnRvcCgpKTsKKyAgICAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgICAgICB2aXN1YWxSZWN0LnNldFRvcChjb250ZW50Umln aHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyKTsKLSAgICAgICAgICAgICAgICB2aXN1YWxS ZWN0Lm1vdmVWZXJ0aWNhbGx5KGRpc3BsYXlMaW5lLnRvcCgpKTsKKyAgICAgICAgICAgICAgICAg ICAgdmlzdWFsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KGRpc3BsYXlMaW5lLmxlZnQoKSk7CisgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJldHVybiB2aXN1YWxSZWN0OwogICAgICAg ICAgICAgfTsKIApAQCAtODAwLDYgKzgwNCwyMiBAQCBJbmxpbmVSZWN0IElubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6ZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZVdpdAog ICAgIHJldHVybiBsb2dpY2FsUmVjdDsKIH0KIAorSW5saW5lUmVjdCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoY29uc3Qg SW5saW5lUmVjdCYgbG9naWNhbFJlY3QsIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlKSBjb25zdAor eworICAgIHN3aXRjaCAod3JpdGluZ01vZGUpIHsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpUb3BU b0JvdHRvbToKKyAgICAgICAgcmV0dXJuIGxvZ2ljYWxSZWN0OworICAgIGNhc2UgV3JpdGluZ01v ZGU6OkxlZnRUb1JpZ2h0OgorICAgIGNhc2UgV3JpdGluZ01vZGU6OlJpZ2h0VG9MZWZ0OgorICAg ICAgICAvLyBTZWUgSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5IGZvciBtb3JlIGluZm8uCisgICAg ICAgIHJldHVybiB7IGxvZ2ljYWxSZWN0LmxlZnQoKSwgbG9naWNhbFJlY3QudG9wKCksIGxvZ2lj YWxSZWN0LmhlaWdodCgpLCBsb2dpY2FsUmVjdC53aWR0aCgpIH07CisgICAgZGVmYXVsdDoKKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBy ZXR1cm4gbG9naWNhbFJlY3Q7Cit9CisKIElubGluZVJlY3QgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpmbGlwUm9vdElubGluZUJveFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlKGNvbnN0 IElubGluZVJlY3QmIHJvb3RJbmxpbmVCb3hMb2dpY2FsUmVjdCwgY29uc3QgSW5saW5lRGlzcGxh eTo6TGluZSYgZGlzcGxheUxpbmUsIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlKSBjb25zdAogewog ICAgIHN3aXRjaCAod3JpdGluZ01vZGUpIHsKQEAgLTgyMiw2ICs4NDIsMzggQEAgSW5saW5lUmVj dCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBSb290SW5saW5lQm94UmVjdFRvVmlz dWFsRm9yV3JpdGluZ00KICAgICByZXR1cm4gcm9vdElubGluZUJveExvZ2ljYWxSZWN0OwogfQog Cit2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6c2V0TGVmdEZvcldyaXRpbmdNb2Rl KElubGluZURpc3BsYXk6OkJveCYgZGlzcGxheUJveCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs TGVmdCwgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUpIGNvbnN0Cit7CisgICAgc3dpdGNoICh3cml0 aW5nTW9kZSkgeworICAgIGNhc2UgV3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgICAgICBk aXNwbGF5Qm94LnNldExlZnQobG9naWNhbExlZnQpOworICAgICAgICBicmVhazsKKyAgICBjYXNl IFdyaXRpbmdNb2RlOjpMZWZ0VG9SaWdodDoKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpSaWdodFRv TGVmdDoKKyAgICAgICAgZGlzcGxheUJveC5zZXRUb3AobG9naWNhbExlZnQpOworICAgICAgICBi cmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAg ICAgYnJlYWs7CisgICAgfQorfQorCit2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 c2V0UmlnaHRGb3JXcml0aW5nTW9kZShJbmxpbmVEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gsIElu bGluZUxheW91dFVuaXQgbG9naWNhbFJpZ2h0LCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSkgY29u c3QKK3sKKyAgICBzd2l0Y2ggKHdyaXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6 VG9wVG9Cb3R0b206CisgICAgICAgIGRpc3BsYXlCb3guc2V0UmlnaHQobG9naWNhbFJpZ2h0KTsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAg Y2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6CisgICAgICAgIGRpc3BsYXlCb3guc2V0Qm90 dG9tKGxvZ2ljYWxSaWdodCk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKIElubGlu ZUxheW91dFBvaW50IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6bW92ZVBvaW50SG9yaXpv bnRhbGx5Rm9yV3JpdGluZ01vZGUoY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxQb2lu dCwgSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsT2Zmc2V0LCBXcml0aW5nTW9kZSB3cml0aW5n TW9kZSkgY29uc3QKIHsKICAgICBhdXRvIHZpc3VhbFBvaW50ID0gbG9naWNhbFBvaW50OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv ZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmgKaW5kZXggMzQ5ZDE1M2YyYWFlYmVlMmQ3ZGYwNDhmMWRmYWViMDljOTM4Zjlk OC4uNWU2ZThlN2UzMGYyNGYzY2MyMGU0ZGYxZGMzMWJmYjkyYzlhNjMyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5oCkBAIC02Nyw3ICs2NywxMCBAQCBwcml2YXRlOgogICAgIHNpemVfdCBlbnN1cmVEaXNw bGF5Qm94Rm9yQ29udGFpbmVyKGNvbnN0IENvbnRhaW5lckJveCYsIERpc3BsYXlCb3hUcmVlJiwg QW5jZXN0b3JTdGFjayYsIERpc3BsYXlCb3hlcyYpOwogCiAgICAgSW5saW5lUmVjdCBmbGlwTG9n aWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlV2l0aGluTGluZShjb25zdCBJbmxpbmVSZWN0 JiBsb2dpY2FsUmVjdCwgY29uc3QgSW5saW5lUmVjdCYgbGluZUxvZ2ljYWxSZWN0LCBXcml0aW5n TW9kZSkgY29uc3Q7CisgICAgSW5saW5lUmVjdCBmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldy aXRpbmdNb2RlKGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBXcml0aW5nTW9kZSkgY29u c3Q7CiAgICAgSW5saW5lUmVjdCBmbGlwUm9vdElubGluZUJveFJlY3RUb1Zpc3VhbEZvcldyaXRp bmdNb2RlKGNvbnN0IElubGluZVJlY3QmIHJvb3RJbmxpbmVCb3hMb2dpY2FsUmVjdCwgY29uc3Qg SW5saW5lRGlzcGxheTo6TGluZSYsIFdyaXRpbmdNb2RlKSBjb25zdDsKKyAgICB2b2lkIHNldExl ZnRGb3JXcml0aW5nTW9kZShJbmxpbmVEaXNwbGF5OjpCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxSaWdodCwgV3JpdGluZ01vZGUpIGNvbnN0OworICAgIHZvaWQgc2V0UmlnaHRGb3JXcml0 aW5nTW9kZShJbmxpbmVEaXNwbGF5OjpCb3gmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxSaWdo dCwgV3JpdGluZ01vZGUpIGNvbnN0OwogICAgIElubGluZUxheW91dFBvaW50IG1vdmVQb2ludEhv cml6b250YWxseUZvcldyaXRpbmdNb2RlKGNvbnN0IElubGluZUxheW91dFBvaW50JiB0b3BMZWZ0 LCBJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxPZmZzZXQsIFdyaXRpbmdNb2RlKSBjb25zdDsK IAogICAgIGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0 dGluZ0NvbnRleHRSb290OyB9Cg== 451554 2022-02-10 09:44:48 -0800 2022-02-10 13:10:40 -0800 [fast-cq]Patch bug-236413-20220210094448.patch text/plain 13256 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdjNjI1NWI3YTUzZDY4 NDg2NTE3NWM4M2ZhNzczZTJkMDMxMTBkYS4uMjdkN2M0MTQ5M2Y3MGUzZTE3NGQ0Zjc0OTk2NWFk NDdkYjM1N2UwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAyLTEwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkanVzdCBi aWRpIChhbmQgbW9zdGx5IFJUTCkgY29vcmRzIHRvIHN1cHBvcnQgdmVydGljYWwgd3JpdGluZyBt b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY0 MTMKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBBZGQg bW9yZSBjb29yZGluYXRlIGZsaXBzIHRvIHRoZSBiaWRpIGNvZGVwYXRoIHRvIHN1cHBvcnQgdmVy dGljYWwgd3JpdGluZyBtb2RlLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVEaXNwbGF5OjpCb3g6OnNldFJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURp c3BsYXk6OkJveDo6c2V0VG9wKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkJv eDo6c2V0Qm90dG9tKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2Vv bWV0cnlGb3JEaXNwbGF5Qm94KTogQ29udmVydCAiaW5saW5lIGRpcmVjdGlvbiB2aXN1YWwsIGJ1 dCB3cml0aW5nIG1vZGUgbG9naWNhbCIgY29vcmRpbmF0ZXMgdG8gZmluYWwuCisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlD b250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnNldFJpZ2h0Rm9yV3JpdGluZ01vZGUgY29uc3QpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisKIDIwMjItMDItMTAgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUHJlcGFyZSBJbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCBmb3Igc3Vw cG9ydGluZyB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUJv eC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKaW5kZXggODNkODgzYmQ2MDFhM2IxNTBlNzI4YmU1MmM5 MWRiMjkxZTUzMzdjNy4uYTJiYzE4YzFmNGRmNjljNWZmNTljOTA3NGZiNjY0OWM4ZDhjY2FjNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94LmgKQEAg LTEzMSw3ICsxMzEsMTkgQEAgc3RydWN0IEJveCB7CiAgICAgewogICAgICAgICBhdXRvIG9mZnNl dCA9IHBoeXNpY2FsUmlnaHQgLSByaWdodCgpOwogICAgICAgICBtX3BoeXNpY2FsUmVjdC5zaGlm dE1heFhFZGdlVG8ocGh5c2ljYWxSaWdodCk7Ci0gICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRN YXhYRWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKKyAgICAgICAgbV9pbmtP dmVyZmxvdy5zaGlmdE1heFhFZGdlVG8obV9pbmtPdmVyZmxvdy5tYXhYKCkgKyBvZmZzZXQpOwor ICAgIH0KKyAgICB2b2lkIHNldFRvcChmbG9hdCBwaHlzaWNhbFRvcCkKKyAgICB7CisgICAgICAg IGF1dG8gb2Zmc2V0ID0gcGh5c2ljYWxUb3AgLSB0b3AoKTsKKyAgICAgICAgbV9waHlzaWNhbFJl Y3Quc2V0WShwaHlzaWNhbFRvcCk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZRWRn ZVRvKG1faW5rT3ZlcmZsb3cueSgpICsgb2Zmc2V0KTsKKyAgICB9CisgICAgdm9pZCBzZXRCb3R0 b20oZmxvYXQgcGh5c2ljYWxCb3R0b20pCisgICAgeworICAgICAgICBhdXRvIG9mZnNldCA9IHBo eXNpY2FsQm90dG9tIC0gYm90dG9tKCk7CisgICAgICAgIG1fcGh5c2ljYWxSZWN0LnNoaWZ0TWF4 WUVkZ2VUbyhwaHlzaWNhbEJvdHRvbSk7CisgICAgICAgIG1faW5rT3ZlcmZsb3cuc2hpZnRNYXhZ RWRnZVRvKG1faW5rT3ZlcmZsb3cubWF4WSgpICsgb2Zmc2V0KTsKICAgICB9CiAgICAgdm9pZCBz ZXRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxv dykKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggZTM4NzM2ZmM0ZDA1OWM3NWZmODNh ZGJjZjU5ZjA5ZjVjZWNkODQxNi4uNmY3MWU5M2Q1MTY1OTRmMDkwOWRmMTZkODc3NWE5NDdhZWVh YjY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtNDYxLDYgKzQ2MSw4IEBAIHN0cnVjdCBJ c0ZpcnN0TGFzdEluZGV4IHsKIHVzaW5nIElzRmlyc3RMYXN0SW5kZXhlc01hcCA9IEhhc2hNYXA8 Y29uc3QgQm94KiwgSXNGaXJzdExhc3RJbmRleD47CiB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbGF5 Qm94Tm9kZUluZGV4LCBJbmxpbmVMYXlvdXRVbml0JiBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyLCBJbmxpbmVMYXlvdXRVbml0IGxpbmVCb3hUb3AsIGNvbnN0IERpc3Bs YXlCb3hUcmVlJiBkaXNwbGF5Qm94VHJlZSwgRGlzcGxheUJveGVzJiBib3hlcywgY29uc3QgTGlu ZUJveCYgbGluZUJveCwgY29uc3QgSXNGaXJzdExhc3RJbmRleGVzTWFwJiBpc0ZpcnN0TGFzdElu ZGV4ZXNNYXApCiB7CisgICAgYXV0byB3cml0aW5nTW9kZSA9IHJvb3QoKS5zdHlsZSgpLndyaXRp bmdNb2RlKCk7CisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IFdlYkNvcmU6Omlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2RlKTsKICAgICAvLyBOb24taW5saW5lIGJv eCBkaXNwbGF5IGJveGVzIGp1c3QgbmVlZCBhIGhvcml6b250YWwgYWRqdXN0bWVudCB3aGlsZQog ICAgIC8vIGlubGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzIG5lZWQKICAgICAvLyAxLiBo b3Jpem9udGFsIGFkanVzdG1lbnQgYW5kIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBzdGFydCBvZmZz ZXR0aW5nIG9uIHRoZSBmaXJzdCBib3gKQEAgLTQ3NiwxMyArNDc4LDEzIEBAIHZvaWQgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3go c2l6ZV90IGRpc3BsCiAKICAgICAgICAgICAgIGF1dG8gYm9yZGVyQm94TGVmdCA9IExheW91dFVu aXQgeyBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICsgYm94TWFyZ2lu TGVmdCB9OwogICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9naWNhbExlZnQoYm9yZGVyQm94 TGVmdCk7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoYm9yZGVyQm94TGVmdCk7Cisg ICAgICAgICAgICBzZXRMZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgYm9yZGVyQm94TGVm dCwgd3JpdGluZ01vZGUpOwogCiAgICAgICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVj dGlvblZpc3VhbE9yZGVyICs9IGJveEdlb21ldHJ5Lm1hcmdpbkJveFdpZHRoKCk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBhdXRvIHdvcmRTcGFjaW5nTWFyZ2luID0gZGlzcGxheUJv eC5pc1dvcmRTZXBhcmF0b3IoKSA/IGxheW91dEJveC5zdHlsZSgpLmZvbnRDYXNjYWRlKCkud29y ZFNwYWNpbmcoKSA6IDAuMGY7Ci0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldExlZnQoY29udGVu dFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luKTsK LSAgICAgICAgICAgIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIgKz0g ZGlzcGxheUJveC53aWR0aCgpICsgd29yZFNwYWNpbmdNYXJnaW47CisgICAgICAgICAgICBzZXRM ZWZ0Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rp b25WaXN1YWxPcmRlciArIHdvcmRTcGFjaW5nTWFyZ2luLCB3cml0aW5nTW9kZSk7CisgICAgICAg ICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICs9IChpc0hvcml6 b250YWxXcml0aW5nTW9kZSA/IGRpc3BsYXlCb3gud2lkdGgoKSA6IGRpc3BsYXlCb3guaGVpZ2h0 KCkpICsgd29yZFNwYWNpbmdNYXJnaW47CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTQ5NCwxNSArNDk2LDE1IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsCiAgICAgYXV0 byBpc0xhc3RCb3ggPSBpc0ZpcnN0TGFzdEluZGV4ZXMubGFzdCAmJiAqaXNGaXJzdExhc3RJbmRl eGVzLmxhc3QgPT0gZGlzcGxheUJveE5vZGVJbmRleDsKICAgICBhdXRvIGJlZm9yZUlubGluZUJv eENvbnRlbnQgPSBbJl0gewogICAgICAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dp Y2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAg ICBhdXRvIHZpc3VhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUJveFRvcCArIGxvZ2ljYWxSZWN0 LnRvcCgpLCBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyLCB7IH0sIGxv Z2ljYWxSZWN0LmhlaWdodCgpIH07CisgICAgICAgIGF1dG8gdmlzdWFsUmVjdCA9IGZsaXBMb2dp Y2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGUoeyBsaW5lQm94VG9wICsgbG9naWNhbFJlY3Qu dG9wKCksIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIsIHsgfSwgbG9n aWNhbFJlY3QuaGVpZ2h0KCkgfSwgd3JpdGluZ01vZGUpOworICAgICAgICBkaXNwbGF5Qm94LnNl dFJlY3QodmlzdWFsUmVjdCwgdmlzdWFsUmVjdCk7CisKICAgICAgICAgYXV0byBzaG91bGRBcHBs eUxlZnRTaWRlID0gKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gJiYgaXNGaXJzdEJveCkgfHwgKCFp c0xlZnRUb1JpZ2h0RGlyZWN0aW9uICYmIGlzTGFzdEJveCk7CiAgICAgICAgIGlmICghc2hvdWxk QXBwbHlMZWZ0U2lkZSkKLSAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnNldFJlY3Qodmlz dWFsUmVjdCwgdmlzdWFsUmVjdCk7CisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgY29u dGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciArPSBtYXJnaW5MZWZ0SW5Jbmxp bmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOwotICAgICAg ICBhdXRvIHZpc3VhbFJlY3RXaXRoTWFyZ2luTGVmdCA9IHZpc3VhbFJlY3Q7Ci0gICAgICAgIHZp c3VhbFJlY3RXaXRoTWFyZ2luTGVmdC5zZXRMZWZ0KGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0 aW9uVmlzdWFsT3JkZXIpOwotICAgICAgICBkaXNwbGF5Qm94LnNldFJlY3QodmlzdWFsUmVjdFdp dGhNYXJnaW5MZWZ0LCB2aXN1YWxSZWN0V2l0aE1hcmdpbkxlZnQpOworICAgICAgICBzZXRMZWZ0 Rm9yV3JpdGluZ01vZGUoZGlzcGxheUJveCwgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25W aXN1YWxPcmRlciwgd3JpdGluZ01vZGUpOwogICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURp cmVjdGlvblZpc3VhbE9yZGVyICs9IGJvcmRlckxlZnRJbklubGluZURpcmVjdGlvbihib3hHZW9t ZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikgKyBwYWRkaW5nTGVmdEluSW5saW5lRGlyZWN0 aW9uKGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKTsKICAgICB9OwogICAgIGJl Zm9yZUlubGluZUJveENvbnRlbnQoKTsKQEAgLTUxMywxMCArNTE1LDEwIEBAIHZvaWQgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3go c2l6ZV90IGRpc3BsCiAgICAgYXV0byBhZnRlcklubGluZUJveENvbnRlbnQgPSBbJl0gewogICAg ICAgICBhdXRvIHNob3VsZEFwcGx5UmlnaHRTaWRlID0gKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24g JiYgaXNMYXN0Qm94KSB8fCAoIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24gJiYgaXNGaXJzdEJveCk7 CiAgICAgICAgIGlmICghc2hvdWxkQXBwbHlSaWdodFNpZGUpCi0gICAgICAgICAgICByZXR1cm4g ZGlzcGxheUJveC5zZXRSaWdodChjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9y ZGVyKTsKKyAgICAgICAgICAgIHJldHVybiBzZXRSaWdodEZvcldyaXRpbmdNb2RlKGRpc3BsYXlC b3gsIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIsIHdyaXRpbmdNb2Rl KTsKIAogICAgICAgICBjb250ZW50UmlnaHRJbklubGluZURpcmVjdGlvblZpc3VhbE9yZGVyICs9 IGJvcmRlclJpZ2h0SW5JbmxpbmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlzTGVmdFRvUmlnaHRE aXJlY3Rpb24pICsgcGFkZGluZ1JpZ2h0SW5JbmxpbmVEaXJlY3Rpb24oYm94R2VvbWV0cnksIGlz TGVmdFRvUmlnaHREaXJlY3Rpb24pOwotICAgICAgICBkaXNwbGF5Qm94LnNldFJpZ2h0KGNvbnRl bnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlzdWFsT3JkZXIpOworICAgICAgICBzZXRSaWdodEZv cldyaXRpbmdNb2RlKGRpc3BsYXlCb3gsIGNvbnRlbnRSaWdodEluSW5saW5lRGlyZWN0aW9uVmlz dWFsT3JkZXIsIHdyaXRpbmdNb2RlKTsKICAgICAgICAgY29udGVudFJpZ2h0SW5JbmxpbmVEaXJl Y3Rpb25WaXN1YWxPcmRlciArPSBtYXJnaW5SaWdodEluSW5saW5lRGlyZWN0aW9uKGJveEdlb21l dHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKTsKICAgICB9OwogICAgIGFmdGVySW5saW5lQm94 Q29udGVudCgpOwpAQCAtNTQyLDcgKzU0NCw4IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAg ICAgYW5jZXN0b3JTdGFjay5wdXNoKHsgfSwgcm9vdCgpKTsKIAogICAgIGF1dG8gd3JpdGluZ01v ZGUgPSByb290KCkuc3R5bGUoKS53cml0aW5nTW9kZSgpOwotICAgIGF1dG8gY29udGVudFN0YXJ0 SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlciA9IChXZWJDb3JlOjppc0hvcml6b250YWxXcml0 aW5nTW9kZSh3cml0aW5nTW9kZSkgPyBkaXNwbGF5TGluZS5sZWZ0KCkgOiBkaXNwbGF5TGluZS50 b3AoKSkgKyBkaXNwbGF5TGluZS5jb250ZW50TG9naWNhbE9mZnNldCgpOworICAgIGF1dG8gaXNI b3Jpem9udGFsV3JpdGluZ01vZGUgPSBXZWJDb3JlOjppc0hvcml6b250YWxXcml0aW5nTW9kZSh3 cml0aW5nTW9kZSk7CisgICAgYXV0byBjb250ZW50U3RhcnRJbklubGluZURpcmVjdGlvblZpc3Vh bE9yZGVyID0gKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gZGlzcGxheUxpbmUubGVmdCgpIDog ZGlzcGxheUxpbmUudG9wKCkpICsgZGlzcGxheUxpbmUuY29udGVudExvZ2ljYWxPZmZzZXQoKTsK ICAgICBhdXRvIGhhc0lubGluZUJveCA9IGZhbHNlOwogICAgIGF1dG8gY3JlYXRlRGlzcGxheUJv eGVzSW5WaXN1YWxPcmRlciA9IFsmXSB7CiAKQEAgLTU2MCwxMSArNTYzLDEzIEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250CiAKICAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJlbGF0aXZlVG9S b290ID0gWyZdKGF1dG8gbG9naWNhbFJlY3QpIHsKICAgICAgICAgICAgICAgICBhdXRvIHZpc3Vh bFJlY3QgPSBmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlV2l0aGluTGluZShs b2dpY2FsUmVjdCwgbGluZUJveC5sb2dpY2FsUmVjdCgpLCB3cml0aW5nTW9kZSk7Ci0gICAgICAg ICAgICAgICAgaWYgKFdlYkNvcmU6OmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKHdyaXRpbmdNb2Rl KSkKKyAgICAgICAgICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpIHsKICAgICAg ICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5zZXRMZWZ0KGNvbnRlbnRSaWdodEluSW5saW5lRGly ZWN0aW9uVmlzdWFsT3JkZXIpOwotICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgdmlzdWFsUmVjdC5tb3ZlVmVydGljYWxseShkaXNwbGF5TGluZS50b3AoKSk7CisgICAg ICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5zZXRU b3AoY29udGVudFJpZ2h0SW5JbmxpbmVEaXJlY3Rpb25WaXN1YWxPcmRlcik7Ci0gICAgICAgICAg ICAgICAgdmlzdWFsUmVjdC5tb3ZlVmVydGljYWxseShkaXNwbGF5TGluZS50b3AoKSk7CisgICAg ICAgICAgICAgICAgICAgIHZpc3VhbFJlY3QubW92ZUhvcml6b250YWxseShkaXNwbGF5TGluZS5s ZWZ0KCkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gdmlzdWFs UmVjdDsKICAgICAgICAgICAgIH07CiAKQEAgLTgwMCw2ICs4MDUsMjIgQEAgSW5saW5lUmVjdCBJ bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmZsaXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3Jp dGluZ01vZGVXaXQKICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CiB9CiAKK0lubGluZVJlY3QgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJlY3RUb1Zpc3VhbEZvcldyaXRp bmdNb2RlKGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBXcml0aW5nTW9kZSB3cml0aW5n TW9kZSkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHdyaXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0 aW5nTW9kZTo6VG9wVG9Cb3R0b206CisgICAgICAgIHJldHVybiBsb2dpY2FsUmVjdDsKKyAgICBj YXNlIFdyaXRpbmdNb2RlOjpMZWZ0VG9SaWdodDoKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpSaWdo dFRvTGVmdDoKKyAgICAgICAgLy8gU2VlIElubGluZUZvcm1hdHRpbmdHZW9tZXRyeSBmb3IgbW9y ZSBpbmZvLgorICAgICAgICByZXR1cm4geyBsb2dpY2FsUmVjdC5sZWZ0KCksIGxvZ2ljYWxSZWN0 LnRvcCgpLCBsb2dpY2FsUmVjdC5oZWlnaHQoKSwgbG9naWNhbFJlY3Qud2lkdGgoKSB9OworICAg IGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsK KyAgICB9CisgICAgcmV0dXJuIGxvZ2ljYWxSZWN0OworfQorCiBJbmxpbmVSZWN0IElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6ZmxpcFJvb3RJbmxpbmVCb3hSZWN0VG9WaXN1YWxGb3JXcml0 aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiByb290SW5saW5lQm94TG9naWNhbFJlY3QsIGNvbnN0 IElubGluZURpc3BsYXk6OkxpbmUmIGRpc3BsYXlMaW5lLCBXcml0aW5nTW9kZSB3cml0aW5nTW9k ZSkgY29uc3QKIHsKICAgICBzd2l0Y2ggKHdyaXRpbmdNb2RlKSB7CkBAIC04MjIsNiArODQzLDM4 IEBAIElubGluZVJlY3QgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwUm9vdElubGlu ZUJveFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNCiAgICAgcmV0dXJuIHJvb3RJbmxpbmVCb3hMb2dp Y2FsUmVjdDsKIH0KIAordm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnNldExlZnRG b3JXcml0aW5nTW9kZShJbmxpbmVEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gsIElubGluZUxheW91 dFVuaXQgbG9naWNhbExlZnQsIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlKSBjb25zdAoreworICAg IHN3aXRjaCAod3JpdGluZ01vZGUpIHsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpUb3BUb0JvdHRv bToKKyAgICAgICAgZGlzcGxheUJveC5zZXRMZWZ0KGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAgY2FzZSBXcml0aW5n TW9kZTo6UmlnaHRUb0xlZnQ6CisgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wKGxvZ2ljYWxMZWZ0 KTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OnNldFJpZ2h0Rm9yV3JpdGluZ01vZGUoSW5saW5lRGlzcGxheTo6Qm94JiBk aXNwbGF5Qm94LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxSaWdodCwgV3JpdGluZ01vZGUgd3Jp dGluZ01vZGUpIGNvbnN0Cit7CisgICAgc3dpdGNoICh3cml0aW5nTW9kZSkgeworICAgIGNhc2Ug V3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgICAgICBkaXNwbGF5Qm94LnNldFJpZ2h0KGxv Z2ljYWxSaWdodCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV3JpdGluZ01vZGU6OkxlZnRU b1JpZ2h0OgorICAgIGNhc2UgV3JpdGluZ01vZGU6OlJpZ2h0VG9MZWZ0OgorICAgICAgICBkaXNw bGF5Qm94LnNldEJvdHRvbShsb2dpY2FsUmlnaHQpOworICAgICAgICBicmVhazsKKyAgICBkZWZh dWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAg fQorfQorCiBJbmxpbmVMYXlvdXRQb2ludCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6Om1v dmVQb2ludEhvcml6b250YWxseUZvcldyaXRpbmdNb2RlKGNvbnN0IElubGluZUxheW91dFBvaW50 JiBsb2dpY2FsUG9pbnQsIElubGluZUxheW91dFVuaXQgaG9yaXpvbnRhbE9mZnNldCwgV3JpdGlu Z01vZGUgd3JpdGluZ01vZGUpIGNvbnN0CiB7CiAgICAgYXV0byB2aXN1YWxQb2ludCA9IGxvZ2lj YWxQb2ludDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4IDM0OWQxNTNmMmFhZWJlZTJkN2RmMDQ4ZjFk ZmFlYjA5YzkzOGY5ZDguLjVlNmU4ZTdlMzBmMjRmM2NjMjBlNGRmMWRjMzFiZmI5MmM5YTYzMjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuaApAQCAtNjcsNyArNjcsMTAgQEAgcHJpdmF0ZToKICAgICBzaXpl X3QgZW5zdXJlRGlzcGxheUJveEZvckNvbnRhaW5lcihjb25zdCBDb250YWluZXJCb3gmLCBEaXNw bGF5Qm94VHJlZSYsIEFuY2VzdG9yU3RhY2smLCBEaXNwbGF5Qm94ZXMmKTsKIAogICAgIElubGlu ZVJlY3QgZmxpcExvZ2ljYWxSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZVdpdGhpbkxpbmUoY29u c3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QsIGNvbnN0IElubGluZVJlY3QmIGxpbmVMb2dpY2Fs UmVjdCwgV3JpdGluZ01vZGUpIGNvbnN0OworICAgIElubGluZVJlY3QgZmxpcExvZ2ljYWxSZWN0 VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCwgV3Jp dGluZ01vZGUpIGNvbnN0OwogICAgIElubGluZVJlY3QgZmxpcFJvb3RJbmxpbmVCb3hSZWN0VG9W aXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiByb290SW5saW5lQm94TG9naWNh bFJlY3QsIGNvbnN0IElubGluZURpc3BsYXk6OkxpbmUmLCBXcml0aW5nTW9kZSkgY29uc3Q7Cisg ICAgdm9pZCBzZXRMZWZ0Rm9yV3JpdGluZ01vZGUoSW5saW5lRGlzcGxheTo6Qm94JiwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsUmlnaHQsIFdyaXRpbmdNb2RlKSBjb25zdDsKKyAgICB2b2lkIHNl dFJpZ2h0Rm9yV3JpdGluZ01vZGUoSW5saW5lRGlzcGxheTo6Qm94JiwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsUmlnaHQsIFdyaXRpbmdNb2RlKSBjb25zdDsKICAgICBJbmxpbmVMYXlvdXRQb2lu dCBtb3ZlUG9pbnRIb3Jpem9udGFsbHlGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVMYXlvdXRQ b2ludCYgdG9wTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsT2Zmc2V0LCBXcml0aW5n TW9kZSkgY29uc3Q7CiAKICAgICBjb25zdCBDb250YWluZXJCb3gmIHJvb3QoKSBjb25zdCB7IHJl dHVybiBtX2Zvcm1hdHRpbmdDb250ZXh0Um9vdDsgfQo=