234135 2021-12-10 02:14:13 -0800 [CSS Container Queries] Basic @container at-rule parsing support 2022-01-24 14:32:46 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto bramus esprehn+autocc ews-watchlist glenn graouts gyuyoung.kim macpherson menard webkit-bug-importer oldest_to_newest 1822597 0 koivisto 2021-12-10 02:14:13 -0800 Parse the at-rule. 1822605 1 446694 koivisto 2021-12-10 02:28:06 -0800 Created attachment 446694 Patch 1822610 2 446697 koivisto 2021-12-10 02:39:48 -0800 Created attachment 446697 Patch 1822656 3 ews-feeder 2021-12-10 05:29:42 -0800 Committed r286845 (245078@main): <https://commits.webkit.org/245078@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446697. 1822657 4 webkit-bug-importer 2021-12-10 05:30:19 -0800 <rdar://problem/86318266> 446694 2021-12-10 02:28:06 -0800 2021-12-10 02:39:43 -0800 Patch bug-234135-20211210122804.patch text/plain 19563 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDM2OTBkYjZmNDczODRkMDIzYjg3ZjYz MWZjNDBmOWI4ODhlNWIzY2MuLmRmNTgwMDA1MzY1MGI1MDcwOGU0OGQzMzYwOGRhYzliYzBlNGYx MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMTItMTAgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIEJhc2ljIEBj b250YWluZXIgcGFyc2luZyAgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhw ZXJpbWVudGFsLnlhbWw6CisKKyAgICAgICAgQWRkIHByZWZlcmVuY2UgZm9yIGNvbnRhaW5lciBx dWVyaWVzLCBkaXNhYmxlZCBieSBkZWZhdWx0LgorCiAyMDIxLTEyLTA5ICBBbGFuIEJ1anRhcyAg PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgdGhlIENTUyBDb250YWluIHByb3Bl cnR5IGJ5IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNzI5NTM1NTQ5MTAzOThjZmJlOTVjMzMzZTk3 OTBmZTJjYjMxNDJlLi42Y2UzYzI5ZmQxZDM2YmNmNTZkYmVjMWViNjNmNjMwOTE4MTU1NTBiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMTItMTAgIEFudHRpIEtvaXZpc3RvICA8 YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIEJhc2lj IEBjb250YWluZXIgcnVsZSBwYXJzaW5nIHN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBiYXNpYyBzdXBwb3J0IGZvciBwYXJz aW5nIEBjb250YWluZXIgYXQtcnVsZXMuCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lc24ndCB5ZXQg cGFyc2UgdGhlIHF1ZXJpZXMgdGhlbXNlbHZlcy4KKyAgICAgICAgCisgICAgICAgIERpc2FibGVk IGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiBjc3MvU3R5bGVSdWxlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlUnVsZUJhc2U6OmRlc3Ryb3kpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVS dWxlQmFzZTo6Y29weSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1bGVCYXNlOjpj cmVhdGVDU1NPTVdyYXBwZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSdWxlQ29u dGFpbmVyOjpTdHlsZVJ1bGVDb250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSdWxl Q29udGFpbmVyOjpjcmVhdGUpOgorICAgICAgICAqIGNzcy9TdHlsZVJ1bGUuaDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlUnVsZUJhc2U6OmlzQ29udGFpbmVyUnVsZSBjb25zdCk6CisgICAgICAg IChpc1R5cGUpOgorICAgICAgICAqIGNzcy9TdHlsZVJ1bGVUeXBlLmg6CisgICAgICAgICogY3Nz L1N0eWxlU2hlZXRDb250ZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0cmF2ZXJzZVJ1bGVz SW5WZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldENvbnRlbnRzOjp0cmF2ZXJz ZVN1YnJlc291cmNlcyBjb25zdCk6CisgICAgICAgICogY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjc3NBdFJ1bGVJRCk6CisgICAgICAgICogY3NzL3BhcnNl ci9DU1NBdFJ1bGVJRC5oOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj09KToKKyAgICAgICAgKFdlYkNvcmU6OmFk ZCk6CisgICAgICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJDb250ZXh0Lmg6CisgICAgICAgICog Y3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNl ckltcGw6OmNvbnN1bWVBdFJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VySW1wbDo6 Y29uc3VtZUNvbnRhaW5lclJ1bGUpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VySW1w bC5oOgorCiAyMDIxLTEyLTEwICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+ CiAKICAgICAgICAgSU9TdXJmYWNlIG1lbW9yeSBhdHRyaWJ1dGlvbiBpcyBoYXJkIHRvIHVzZSBp biBjb25zdHJ1Y3RvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNl cy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1By ZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKaW5kZXggODhiYWJhYWI1 MDNmZTRjNjlhYWE0MDMzMjgxZTY0NDA2MjFjNTAwZi4uOWUyNzRhMWE0NmNjYzE2NDJhZjNiZjMz YWIxMWQ4NmExMzExMTgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVu Y2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKKysrIGIvU291cmNlL1dURi9TY3Jp cHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKQEAgLTIyNCw2 ICsyMjQsMTggQEAgQ1NTQ29sb3JNaXhFbmFibGVkOgogICAgIFdlYkNvcmU6CiAgICAgICBkZWZh dWx0OiBmYWxzZQogCitDU1NDb250YWluZXJRdWVyaWVzRW5hYmxlZDoKKyAgdHlwZTogYm9vbAor ICBodW1hblJlYWRhYmxlTmFtZTogIkNTUyBDb250YWluZXIgUXVlcmllcyIKKyAgaHVtYW5SZWFk YWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIENTUyBDb250YWluZXIgUXVlcmllcyIKKyAgZGVmYXVs dFZhbHVlOgorICAgIFdlYktpdExlZ2FjeToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgV2Vi S2l0OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJDb3JlOgorICAgICAgZGVmYXVsdDog ZmFsc2UKKwogQ1NTQ29udGFpbm1lbnRFbmFibGVkOgogICB0eXBlOiBib29sCiAgIGh1bWFuUmVh ZGFibGVOYW1lOiAiQ1NTIENvbnRhaW5tZW50IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlUnVsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmNwcAppbmRl eCA4OGYwMmNiOGE3ZmZkNjk0OGRiZGJkMzIxOTNlM2NiYWM5MDE3YWE1Li43YmEzYWRhODUxOWU5 NGUyMGJmYmRhMjQwN2EyNmQ2MDMwNjdlYjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSdWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmNwcApA QCAtMTA0LDYgKzEwNCw5IEBAIHZvaWQgU3R5bGVSdWxlQmFzZTo6ZGVzdHJveSgpCiAgICAgY2Fz ZSBTdHlsZVJ1bGVUeXBlOjpMYXllclN0YXRlbWVudDoKICAgICAgICAgZGVsZXRlIGRvd25jYXN0 PFN0eWxlUnVsZUxheWVyPih0aGlzKTsKICAgICAgICAgcmV0dXJuOworICAgIGNhc2UgU3R5bGVS dWxlVHlwZTo6Q29udGFpbmVyOgorICAgICAgICBkZWxldGUgZG93bmNhc3Q8U3R5bGVSdWxlQ29u dGFpbmVyPih0aGlzKTsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6 VW5rbm93bjoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsK QEAgLTEzMyw2ICsxMzYsOCBAQCBSZWY8U3R5bGVSdWxlQmFzZT4gU3R5bGVSdWxlQmFzZTo6Y29w eSgpIGNvbnN0CiAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpMYXllckJsb2NrOgogICAgIGNhc2Ug U3R5bGVSdWxlVHlwZTo6TGF5ZXJTdGF0ZW1lbnQ6CiAgICAgICAgIHJldHVybiBkb3duY2FzdDxT dHlsZVJ1bGVMYXllcj4oKnRoaXMpLmNvcHkoKTsKKyAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkNv bnRhaW5lcjoKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PFN0eWxlUnVsZUNvbnRhaW5lcj4oKnRo aXMpLmNvcHkoKTsKICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkltcG9ydDoKICAgICBjYXNlIFN0 eWxlUnVsZVR5cGU6Ok5hbWVzcGFjZToKICAgICAgICAgLy8gRklYTUU6IENvcHkgaW1wb3J0IGFu ZCBuYW1lc3BhY2UgcnVsZXMuCkBAIC0xODYsNiArMTkxLDkgQEAgUmVmPENTU1J1bGU+IFN0eWxl UnVsZUJhc2U6OmNyZWF0ZUNTU09NV3JhcHBlcihDU1NTdHlsZVNoZWV0KiBwYXJlbnRTaGVldCwg Q1NTUnUKICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyU3RhdGVtZW50OgogICAgICAgICBy dWxlID0gQ1NTTGF5ZXJTdGF0ZW1lbnRSdWxlOjpjcmVhdGUoZG93bmNhc3Q8U3R5bGVSdWxlTGF5 ZXI+KHNlbGYpLCBwYXJlbnRTaGVldCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgU3R5bGVS dWxlVHlwZTo6Q29udGFpbmVyOgorICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50IENTU09NLgor ICAgICAgICBicmVhazsKICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OlVua25vd246CiAgICAgY2Fz ZSBTdHlsZVJ1bGVUeXBlOjpDaGFyc2V0OgogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6S2V5ZnJh bWU6CkBAIC0zNjIsNiArMzcwLDggQEAgRGVmZXJyZWRTdHlsZUdyb3VwUnVsZUxpc3Q6OkRlZmVy cmVkU3R5bGVHcm91cFJ1bGVMaXN0KGNvbnN0IENTU1BhcnNlclRva2VuUmFuZ2UKICAgICBtX3Rv a2Vucy5hcHBlbmQocmFuZ2UuYmVnaW4oKSwgbGVuZ3RoKTsKIH0KIAorRGVmZXJyZWRTdHlsZUdy b3VwUnVsZUxpc3Q6On5EZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlzdCgpID0gZGVmYXVsdDsKKwog dm9pZCBEZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlzdDo6cGFyc2VEZWZlcnJlZFJ1bGVzKFZlY3Rv cjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiBjaGlsZFJ1bGVzKQogewogICAgIG1fcGFyc2VyLT5w YXJzZVJ1bGVMaXN0KG1fdG9rZW5zLCBjaGlsZFJ1bGVzKTsKQEAgLTUyMyw2ICs1MzMsMzQgQEAg UmVmPFN0eWxlUnVsZUxheWVyPiBTdHlsZVJ1bGVMYXllcjo6Y3JlYXRlQmxvY2soQ2FzY2FkZUxh eWVyTmFtZSYmIG5hbWUsIHN0ZDo6dW4KICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTdHlsZVJ1 bGVMYXllcihXVEZNb3ZlKG5hbWUpLCBXVEZNb3ZlKHJ1bGVzKSkpOwogfQogCitTdHlsZVJ1bGVD b250YWluZXI6OlN0eWxlUnVsZUNvbnRhaW5lcihDb250YWluZXJRdWVyeSYmIHF1ZXJ5LCBWZWN0 b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+PiYmIHJ1bGVzKQorICAgIDogU3R5bGVSdWxlR3JvdXAo U3R5bGVSdWxlVHlwZTo6Q29udGFpbmVyLCBXVEZNb3ZlKHJ1bGVzKSkKKyAgICAsIG1fcXVlcnko V1RGTW92ZShxdWVyeSkpCit7Cit9CisKK1N0eWxlUnVsZUNvbnRhaW5lcjo6U3R5bGVSdWxlQ29u dGFpbmVyKENvbnRhaW5lclF1ZXJ5JiYgcXVlcnksIHN0ZDo6dW5pcXVlX3B0cjxEZWZlcnJlZFN0 eWxlR3JvdXBSdWxlTGlzdD4mJiBydWxlcykKKyAgICA6IFN0eWxlUnVsZUdyb3VwKFN0eWxlUnVs ZVR5cGU6OkNvbnRhaW5lciwgV1RGTW92ZShydWxlcykpCisgICAgLCBtX3F1ZXJ5KFdURk1vdmUo cXVlcnkpKQoreworfQorCitTdHlsZVJ1bGVDb250YWluZXI6OlN0eWxlUnVsZUNvbnRhaW5lcihj b25zdCBTdHlsZVJ1bGVDb250YWluZXImIG90aGVyKQorICAgIDogU3R5bGVSdWxlR3JvdXAob3Ro ZXIpCisgICAgLCBtX3F1ZXJ5KG90aGVyLm1fcXVlcnkpCit7Cit9CisKK1JlZjxTdHlsZVJ1bGVD b250YWluZXI+IFN0eWxlUnVsZUNvbnRhaW5lcjo6Y3JlYXRlKENvbnRhaW5lclF1ZXJ5JiYgcXVl cnksIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiYgcnVsZXMpCit7CisgICAgcmV0dXJu IGFkb3B0UmVmKCpuZXcgU3R5bGVSdWxlQ29udGFpbmVyKFdURk1vdmUocXVlcnkpLCBXVEZNb3Zl KHJ1bGVzKSkpOworfQorCitSZWY8U3R5bGVSdWxlQ29udGFpbmVyPiBTdHlsZVJ1bGVDb250YWlu ZXI6OmNyZWF0ZShDb250YWluZXJRdWVyeSYmIHF1ZXJ5LCBzdGQ6OnVuaXF1ZV9wdHI8RGVmZXJy ZWRTdHlsZUdyb3VwUnVsZUxpc3Q+JiYgcnVsZXMpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgU3R5bGVSdWxlQ29udGFpbmVyKFdURk1vdmUocXVlcnkpLCBXVEZNb3ZlKHJ1bGVzKSkpOwor fQorCiBTdHlsZVJ1bGVDaGFyc2V0OjpTdHlsZVJ1bGVDaGFyc2V0KCkKICAgICA6IFN0eWxlUnVs ZUJhc2UoU3R5bGVSdWxlVHlwZTo6Q2hhcnNldCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJ1bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuaAppbmRl eCA0OGRjMTI4NDA3MjBhMWExNzY5YWM1MTM2MDNhMDcyZDUxOWVhYTcyLi5jZDE1Zjg3YTMyNWU1 M2UyMGRlN2ZhMjgyMGU4M2QwZmEyMjA3MDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSdWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5oCkBAIC02 MCwxMCArNjAsMTEgQEAgcHVibGljOgogICAgIGJvb2wgaXNNZWRpYVJ1bGUoKSBjb25zdCB7IHJl dHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6TWVkaWE7IH0KICAgICBib29sIGlzUGFnZVJ1 bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6UGFnZTsgfQogICAg IGJvb2wgaXNTdHlsZVJ1bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlw ZTo6U3R5bGU7IH0KLSAgICBib29sIGlzR3JvdXBSdWxlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgp ID09IFN0eWxlUnVsZVR5cGU6Ok1lZGlhIHx8IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpTdXBw b3J0cyB8fCB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6TGF5ZXJCbG9jazsgfQorICAgIGJvb2wg aXNHcm91cFJ1bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6TWVk aWEgfHwgdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6OlN1cHBvcnRzIHx8IHR5cGUoKSA9PSBTdHls ZVJ1bGVUeXBlOjpMYXllckJsb2NrIHx8IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpDb250YWlu ZXI7IH0KICAgICBib29sIGlzU3VwcG9ydHNSdWxlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09 IFN0eWxlUnVsZVR5cGU6OlN1cHBvcnRzOyB9CiAgICAgYm9vbCBpc0ltcG9ydFJ1bGUoKSBjb25z dCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6SW1wb3J0OyB9CiAgICAgYm9vbCBp c0xheWVyUnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpMYXll ckJsb2NrIHx8IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpMYXllclN0YXRlbWVudDsgfQorICAg IGJvb2wgaXNDb250YWluZXJSdWxlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09IFN0eWxlUnVs ZVR5cGU6OkNvbnRhaW5lcjsgfQogCiAgICAgUmVmPFN0eWxlUnVsZUJhc2U+IGNvcHkoKSBjb25z dDsKIApAQCAtMjI4LDYgKzIyOSw3IEBAIGNsYXNzIERlZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0 IGZpbmFsIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBEZWZl cnJlZFN0eWxlR3JvdXBSdWxlTGlzdChjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJiwgQ1NTRGVm ZXJyZWRQYXJzZXImKTsKKyAgICB+RGVmZXJyZWRTdHlsZUdyb3VwUnVsZUxpc3QoKTsKICAgICAK ICAgICB2b2lkIHBhcnNlRGVmZXJyZWRSdWxlcyhWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ PiYpOwogICAgIHZvaWQgcGFyc2VEZWZlcnJlZEtleWZyYW1lcyhTdHlsZVJ1bGVLZXlmcmFtZXMm KTsKQEAgLTMxMiw2ICszMTQsMjQgQEAgcHJpdmF0ZToKICAgICBzdGQ6OnZhcmlhbnQ8Q2FzY2Fk ZUxheWVyTmFtZSwgVmVjdG9yPENhc2NhZGVMYXllck5hbWU+PiBtX25hbWVWYXJpYW50OwogfTsK IAorc3RydWN0IENvbnRhaW5lclF1ZXJ5IHsgfTsKKworY2xhc3MgU3R5bGVSdWxlQ29udGFpbmVy IGZpbmFsIDogcHVibGljIFN0eWxlUnVsZUdyb3VwIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUmVm PFN0eWxlUnVsZUNvbnRhaW5lcj4gY3JlYXRlKENvbnRhaW5lclF1ZXJ5JiYsIFZlY3RvcjxSZWZQ dHI8U3R5bGVSdWxlQmFzZT4+JiYpOworICAgIHN0YXRpYyBSZWY8U3R5bGVSdWxlQ29udGFpbmVy PiBjcmVhdGUoQ29udGFpbmVyUXVlcnkmJiwgc3RkOjp1bmlxdWVfcHRyPERlZmVycmVkU3R5bGVH cm91cFJ1bGVMaXN0PiYmKTsKKyAgICBSZWY8U3R5bGVSdWxlQ29udGFpbmVyPiBjb3B5KCkgY29u c3QgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBTdHlsZVJ1bGVDb250YWluZXIoKnRoaXMpKTsgfQor CisgICAgY29uc3QgQ29udGFpbmVyUXVlcnkmIHF1ZXJ5KCkgY29uc3QgeyByZXR1cm4gbV9xdWVy eTsgfQorCitwcml2YXRlOgorICAgIFN0eWxlUnVsZUNvbnRhaW5lcihDb250YWluZXJRdWVyeSYm LCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+PiYmKTsKKyAgICBTdHlsZVJ1bGVDb250YWlu ZXIoQ29udGFpbmVyUXVlcnkmJiwgc3RkOjp1bmlxdWVfcHRyPERlZmVycmVkU3R5bGVHcm91cFJ1 bGVMaXN0PiYmKTsKKyAgICBTdHlsZVJ1bGVDb250YWluZXIoY29uc3QgU3R5bGVSdWxlQ29udGFp bmVyJik7CisKKyAgICBDb250YWluZXJRdWVyeSBtX3F1ZXJ5OworfTsKKwogLy8gVGhpcyBpcyBv bmx5IHVzZWQgYnkgdGhlIENTUyBwYXJzZXIuCiBjbGFzcyBTdHlsZVJ1bGVDaGFyc2V0IGZpbmFs IDogcHVibGljIFN0eWxlUnVsZUJhc2UgewogcHVibGljOgpAQCAtNDM1LDMgKzQ1NSw3IEBAIFNQ RUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVHSU4o V2ViQ29yZTo6U3R5bGVSdWxlTGF5ZXIpCiAgICAgc3RhdGljIGJvb2wgaXNUeXBlKGNvbnN0IFdl YkNvcmU6OlN0eWxlUnVsZUJhc2UmIHJ1bGUpIHsgcmV0dXJuIHJ1bGUuaXNMYXllclJ1bGUoKTsg fQogU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQorCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRT X0JFR0lOKFdlYkNvcmU6OlN0eWxlUnVsZUNvbnRhaW5lcikKKyAgICBzdGF0aWMgYm9vbCBpc1R5 cGUoY29uc3QgV2ViQ29yZTo6U3R5bGVSdWxlQmFzZSYgcnVsZSkgeyByZXR1cm4gcnVsZS5pc0Nv bnRhaW5lclJ1bGUoKTsgfQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZVR5cGUuaCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJ1bGVUeXBlLmgKaW5kZXggMzY4NDY1ZDZmNDc0ZWIzZTcxMTIyMjM3N2UwYmNhMTM0 YTE5M2JlMy4uZGUxMDg4YWE3YmFlNjkzYzg3YzllYTMwODU1ZTY4ZDUzNzhmYmZjMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZVR5cGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVSdWxlVHlwZS5oCkBAIC00Miw2ICs0Miw3IEBAIGVudW0gY2xhc3MgU3R5 bGVSdWxlVHlwZSA6IHVpbnQ4X3QgewogICAgIFN1cHBvcnRzID0gMTIsCiAgICAgTGF5ZXJCbG9j ayA9IDE2LAogICAgIExheWVyU3RhdGVtZW50ID0gMTcsCisgICAgQ29udGFpbmVyID0gMTgsCiAg ICAgRm9udFBhbGV0dGVWYWx1ZXMgPSAxOSwKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVNoZWV0Q29udGVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl U2hlZXRDb250ZW50cy5jcHAKaW5kZXggYWM1ZDA5M2FmNjQ2ZmNlYmFiNWUzNDBhNWI3OGRkZDFk ZmY0YmQyMi4uMzAxYzM1ZWI3MGNlNmMyOThkZTk1ZjRiMjBlZjJmOTlhYTIyNmU3OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5jcHAKQEAgLTQ1OCw3ICs0NTgsOCBA QCBzdGF0aWMgYm9vbCB0cmF2ZXJzZVJ1bGVzSW5WZWN0b3IoY29uc3QgVmVjdG9yPFJlZlB0cjxT dHlsZVJ1bGVCYXNlPj4mIHJ1bGVzLCBjbwogICAgICAgICBzd2l0Y2ggKHJ1bGUtPnR5cGUoKSkg ewogICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6Ok1lZGlhOgogICAgICAgICBjYXNlIFN0eWxl UnVsZVR5cGU6OlN1cHBvcnRzOgotICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyQmxv Y2s6IHsKKyAgICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpMYXllckJsb2NrOgorICAgICAgICBj YXNlIFN0eWxlUnVsZVR5cGU6OkNvbnRhaW5lcjogewogICAgICAgICAgICAgYXV0byogY2hpbGRS dWxlcyA9IGRvd25jYXN0PFN0eWxlUnVsZUdyb3VwPigqcnVsZSkuY2hpbGRSdWxlc1dpdGhvdXRE ZWZlcnJlZFBhcnNpbmcoKTsKICAgICAgICAgICAgIGlmIChjaGlsZFJ1bGVzICYmIHRyYXZlcnNl UnVsZXNJblZlY3RvcigqY2hpbGRSdWxlcywgaGFuZGxlcikpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CkBAIC01MjIsNiArNTIzLDcgQEAgYm9vbCBTdHlsZVNoZWV0Q29udGVudHM6OnRy YXZlcnNlU3VicmVzb3VyY2VzKGNvbnN0IEZ1bmN0aW9uPGJvb2woY29uc3QgQ2FjaGVkUmUKICAg ICAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpTdXBwb3J0czoKICAgICAgICAgY2FzZSBTdHlsZVJ1 bGVUeXBlOjpMYXllckJsb2NrOgogICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyU3Rh dGVtZW50OgorICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkNvbnRhaW5lcjoKICAgICAgICAg Y2FzZSBTdHlsZVJ1bGVUeXBlOjpGb250UGFsZXR0ZVZhbHVlczoKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTQXRSdWxlSUQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJ RC5jcHAKaW5kZXggZTdlNzRkNGVkZmQ4N2M0ZDdjOWViNTQ3N2M3ZTgyYzNiNTI3OTljZi4uMjQ4 ZjllZjVmYjljNjg0ZGNhNDJlYzBkZGEyZTBmM2MxNWJhN2ViYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5jcHAKQEAgLTU2LDEyICs1NiwxMiBAQCBDU1NBdFJ1bGVJ RCBjc3NBdFJ1bGVJRChTdHJpbmdWaWV3IG5hbWUpCiAgICAgICAgIHJldHVybiBDU1NBdFJ1bGVW aWV3cG9ydDsKICAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAiLXdlYmtpdC1r ZXlmcmFtZXMiKSkKICAgICAgICAgcmV0dXJuIENTU0F0UnVsZVdlYmtpdEtleWZyYW1lczsKLSAg ICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAiYXBwbHkiKSkKLSAgICAgICAgcmV0 dXJuIENTU0F0UnVsZUFwcGx5OwogICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUs ICJjb3VudGVyLXN0eWxlIikpCiAgICAgICAgIHJldHVybiBDU1NBdFJ1bGVDb3VudGVyU3R5bGU7 CiAgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobmFtZSwgImxheWVyIikpCiAgICAgICAg IHJldHVybiBDU1NBdFJ1bGVMYXllcjsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShu YW1lLCAiY29udGFpbmVyIikpCisgICAgICAgIHJldHVybiBDU1NBdFJ1bGVDb250YWluZXI7CiAg ICAgcmV0dXJuIENTU0F0UnVsZUludmFsaWQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTQXRSdWxlSUQuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIv Q1NTQXRSdWxlSUQuaAppbmRleCBlNjZjMDQzNzdkYzQ5ZTQwNjg3Y2RmNmMyYzZlNTRmZDhlMDg1 M2YyLi5kY2FlNzk2ZmYwMDE3NTU3NzA1NzJhZDM5NGJjZDZhNmI4NzMwMDgwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmgKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5oCkBAIC0zNSwyMiArMzUsMjIgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogZW51bSBDU1NBdFJ1bGVJRCB7CiAgICAgQ1NTQXRSdWxlSW52YWxpZCA9 IDAsCiAKLSAgICBDU1NBdFJ1bGVDaGFyc2V0ID0gMSwKLSAgICBDU1NBdFJ1bGVGb250RmFjZSA9 IDIsCi0gICAgQ1NTQXRSdWxlSW1wb3J0ID0gMywKLSAgICBDU1NBdFJ1bGVLZXlmcmFtZXMgPSA0 LAotICAgIENTU0F0UnVsZU1lZGlhID0gNSwKLSAgICBDU1NBdFJ1bGVOYW1lc3BhY2UgPSA2LAot ICAgIENTU0F0UnVsZVBhZ2UgPSA3LAotICAgIENTU0F0UnVsZVN1cHBvcnRzID0gOCwKLSAgICBD U1NBdFJ1bGVWaWV3cG9ydCA9IDksCi0KLSAgICBDU1NBdFJ1bGVXZWJraXRLZXlmcmFtZXMgPSAx MCwKLSAgICBDU1NBdFJ1bGVBcHBseSA9IDExLAotICAgIENTU0F0UnVsZUNvdW50ZXJTdHlsZSA9 IDEyLAotICAgIENTU0F0UnVsZUxheWVyID0gMTMsCi0KLSAgICBDU1NBdFJ1bGVGb250UGFsZXR0 ZVZhbHVlcyA9IDE0LAorICAgIENTU0F0UnVsZUNoYXJzZXQsCisgICAgQ1NTQXRSdWxlRm9udEZh Y2UsCisgICAgQ1NTQXRSdWxlSW1wb3J0LAorICAgIENTU0F0UnVsZUtleWZyYW1lcywKKyAgICBD U1NBdFJ1bGVNZWRpYSwKKyAgICBDU1NBdFJ1bGVOYW1lc3BhY2UsCisgICAgQ1NTQXRSdWxlUGFn ZSwKKyAgICBDU1NBdFJ1bGVTdXBwb3J0cywKKyAgICBDU1NBdFJ1bGVWaWV3cG9ydCwKKworICAg IENTU0F0UnVsZVdlYmtpdEtleWZyYW1lcywKKyAgICBDU1NBdFJ1bGVDb3VudGVyU3R5bGUsCisg ICAgQ1NTQXRSdWxlTGF5ZXIsCisgICAgQ1NTQXRSdWxlQ29udGFpbmVyLAorCisgICAgQ1NTQXRS dWxlRm9udFBhbGV0dGVWYWx1ZXMsCiB9OwogCiBDU1NBdFJ1bGVJRCBjc3NBdFJ1bGVJRChTdHJp bmdWaWV3IG5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQ YXJzZXJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyQ29u dGV4dC5jcHAKaW5kZXggYTg2MDRhMDZhZjk0ZGU4ZTVjODU0ZTU5ZmJiNTExMmY1NjVhMDQ5Ny4u ZjMyMjk2ZWJjY2UyOGRjYWI0ZGQ2ZTRiYjkyNzEwODM0NWYxYWQ1MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckNvbnRleHQuY3BwCkBAIC0xMDUsNiArMTA1LDcg QEAgQ1NTUGFyc2VyQ29udGV4dDo6Q1NTUGFyc2VyQ29udGV4dChjb25zdCBEb2N1bWVudCYgZG9j dW1lbnQsIGNvbnN0IFVSTCYgc2hlZXRCYXMKICAgICAsIGZvY3VzVmlzaWJsZUVuYWJsZWQgeyBk b2N1bWVudC5zZXR0aW5ncygpLmZvY3VzVmlzaWJsZUVuYWJsZWQoKSB9CiAgICAgLCBoYXNQc2V1 ZG9DbGFzc0VuYWJsZWQgeyBkb2N1bWVudC5zZXR0aW5ncygpLmhhc1BzZXVkb0NsYXNzRW5hYmxl ZCgpIH0KICAgICAsIGNhc2NhZGVMYXllcnNFbmFibGVkIHsgZG9jdW1lbnQuc2V0dGluZ3MoKS5j c3NDYXNjYWRlTGF5ZXJzRW5hYmxlZCgpIH0KKyAgICAsIGNvbnRhaW5lclF1ZXJpZXNFbmFibGVk IHsgZG9jdW1lbnQuc2V0dGluZ3MoKS5jc3NDb250YWluZXJRdWVyaWVzRW5hYmxlZCgpIH0KICNp ZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgICwgYXR0YWNobWVudEVuYWJsZWQgeyBS dW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmF0dGFjaG1lbnRFbGVtZW50 RW5hYmxlZCgpIH0KICNlbmRpZgpAQCAtMTUxLDYgKzE1Miw3IEBAIGJvb2wgb3BlcmF0b3I9PShj b25zdCBDU1NQYXJzZXJDb250ZXh0JiBhLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBiKQogICAg ICAgICAmJiBhLmZvY3VzVmlzaWJsZUVuYWJsZWQgPT0gYi5mb2N1c1Zpc2libGVFbmFibGVkCiAg ICAgICAgICYmIGEuaGFzUHNldWRvQ2xhc3NFbmFibGVkID09IGIuaGFzUHNldWRvQ2xhc3NFbmFi bGVkCiAgICAgICAgICYmIGEuY2FzY2FkZUxheWVyc0VuYWJsZWQgPT0gYi5jYXNjYWRlTGF5ZXJz RW5hYmxlZAorICAgICAgICAmJiBhLmNvbnRhaW5lclF1ZXJpZXNFbmFibGVkID09IGIuY29udGFp bmVyUXVlcmllc0VuYWJsZWQKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgICAg ICAmJiBhLmF0dGFjaG1lbnRFbmFibGVkID09IGIuYXR0YWNobWVudEVuYWJsZWQKICNlbmRpZgpA QCAtMTkwLDEyICsxOTIsMTMgQEAgdm9pZCBhZGQoSGFzaGVyJiBoYXNoZXIsIGNvbnN0IENTU1Bh cnNlckNvbnRleHQmIGNvbnRleHQpCiAgICAgICAgIHwgY29udGV4dC5mb2N1c1Zpc2libGVFbmFi bGVkICAgICAgICAgICAgICAgICAgICAgICA8PCAyMQogICAgICAgICB8IGNvbnRleHQuaGFzUHNl dWRvQ2xhc3NFbmFibGVkICAgICAgICAgICAgICAgICAgICAgPDwgMjIKICAgICAgICAgfCBjb250 ZXh0LmNhc2NhZGVMYXllcnNFbmFibGVkICAgICAgICAgICAgICAgICAgICAgIDw8IDIzCisgICAg ICAgIHwgY29udGV4dC5jb250YWluZXJRdWVyaWVzRW5hYmxlZCAgICAgICAgICAgICAgICAgICA8 PCAyNAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCi0gICAgICAgIHwgY29udGV4dC5h dHRhY2htZW50RW5hYmxlZCAgICAgICAgICAgICAgICAgICAgICAgICA8PCAyNAorICAgICAgICB8 IGNvbnRleHQuYXR0YWNobWVudEVuYWJsZWQgICAgICAgICAgICAgICAgICAgICAgICAgPDwgMjUK ICNlbmRpZgotICAgICAgICB8IGNvbnRleHQub3ZlcmZsb3dDbGlwRW5hYmxlZCAgICAgICAgICAg ICAgICAgICAgICAgPDwgMjUKLSAgICAgICAgfCBjb250ZXh0LmFjY2VudENvbG9yRW5hYmxlZCAg ICAgICAgICAgICAgICAgICAgICAgIDw8IDI2Ci0gICAgICAgIHwgY29udGV4dC5tb2RlICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8PCAyNzsgLy8gVGhpcyBpcyBtdWx0aXBs ZSBiaXRzLCBzbyBrZWVwIGl0IGxhc3QuCisgICAgICAgIHwgY29udGV4dC5vdmVyZmxvd0NsaXBF bmFibGVkICAgICAgICAgICAgICAgICAgICAgICA8PCAyNgorICAgICAgICB8IGNvbnRleHQuYWNj ZW50Q29sb3JFbmFibGVkICAgICAgICAgICAgICAgICAgICAgICAgPDwgMjcKKyAgICAgICAgfCBj b250ZXh0Lm1vZGUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDI4OyAv LyBUaGlzIGlzIG11bHRpcGxlIGJpdHMsIHNvIGtlZXAgaXQgbGFzdC4KICAgICBhZGQoaGFzaGVy LCBjb250ZXh0LmJhc2VVUkwsIGNvbnRleHQuY2hhcnNldCwgYml0cyk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJDb250ZXh0LmgKaW5kZXggNzlmMTFlOTQwMzhh Njg2ZjNhNjM4OGVkYzIwOTU0NmY5YzQ5MTY2Mi4uMmI5MWQxNWUzMTAyNDlkODgzNmY3OTU0NzFm NDllNTk0MjMxNTVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQ YXJzZXJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJD b250ZXh0LmgKQEAgLTg0LDYgKzg0LDcgQEAgc3RydWN0IENTU1BhcnNlckNvbnRleHQgewogICAg IGJvb2wgZm9jdXNWaXNpYmxlRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBoYXNQc2V1ZG9D bGFzc0VuYWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgY2FzY2FkZUxheWVyc0VuYWJsZWQgeyBm YWxzZSB9OworICAgIGJvb2wgY29udGFpbmVyUXVlcmllc0VuYWJsZWQgeyBmYWxzZSB9OwogCiAg ICAgLy8gUnVudGltZUVuYWJsZWRGZWF0dXJlcy4KICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVN RU5UKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5jcHAKaW5kZXgg NDU2NDFiNWY2YjhlMWE3YzMwODI2MzgwMTNiOWEyYWU1MGQ0MzFjMi4uYWJjNDY1YTRjMmE0YzI4 YmZmZmM2Yzg5N2ExZmFjNjIwMjU2MGUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2Vy L0NTU1BhcnNlckltcGwuY3BwCkBAIC00NjUsNiArNDY1LDggQEAgUmVmUHRyPFN0eWxlUnVsZUJh c2U+IENTU1BhcnNlckltcGw6OmNvbnN1bWVBdFJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFu Z2UsIEEKICAgICAgICAgcmV0dXJuIGNvbnN1bWVDb3VudGVyU3R5bGVSdWxlKHByZWx1ZGUsIGJs b2NrKTsKICAgICBjYXNlIENTU0F0UnVsZUxheWVyOgogICAgICAgICByZXR1cm4gY29uc3VtZUxh eWVyUnVsZShwcmVsdWRlLCBibG9jayk7CisgICAgY2FzZSBDU1NBdFJ1bGVDb250YWluZXI6Cisg ICAgICAgIHJldHVybiBjb25zdW1lQ29udGFpbmVyUnVsZShwcmVsdWRlLCBibG9jayk7CiAgICAg ZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIG51bGxwdHI7IC8vIFBhcnNlIGVycm9yLCB1bnJlY29n bmlzZWQgYXQtcnVsZSB3aXRoIGJsb2NrCiAgICAgfQpAQCAtODU1LDE3ICs4NTcsMzIgQEAgUmVm UHRyPFN0eWxlUnVsZUxheWVyPiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lTGF5ZXJSdWxlKENTU1Bh cnNlclRva2VuUmFuZ2UgcHJlbHUKICAgICByZXR1cm4gU3R5bGVSdWxlTGF5ZXI6OmNyZWF0ZUJs b2NrKFdURk1vdmUoKm5hbWUpLCBXVEZNb3ZlKHJ1bGVzKSk7CiB9CiAKLS8vIEZJWE1FLU5FV1BB UlNFUjogU3VwcG9ydCAiYXBwbHkiCi0vKnZvaWQgQ1NTUGFyc2VySW1wbDo6Y29uc3VtZUFwcGx5 UnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUpCitSZWZQdHI8U3R5bGVSdWxlQ29udGFp bmVyPiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lQ29udGFpbmVyUnVsZShDU1NQYXJzZXJUb2tlblJh bmdlIHByZWx1ZGUsIENTU1BhcnNlclRva2VuUmFuZ2UgYmxvY2spCiB7Ci0gICAgY29uc3QgQ1NT UGFyc2VyVG9rZW4mIGlkZW50ID0gcHJlbHVkZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgp OwotICAgIGlmICghcHJlbHVkZS5hdEVuZCgpIHx8ICFDU1NWYXJpYWJsZVBhcnNlcjo6aXNWYWxp ZFZhcmlhYmxlTmFtZShpZGVudCkpCi0gICAgICAgIHJldHVybjsgLy8gUGFyc2UgZXJyb3IsIGV4 cGVjdGVkIGEgc2luZ2xlIGN1c3RvbSBwcm9wZXJ0eSBuYW1lCi0gICAgbV9wYXJzZWRQcm9wZXJ0 aWVzLmFwcGVuZChDU1NQcm9wZXJ0eSgKLSAgICAgICAgQ1NTUHJvcGVydHlBcHBseUF0UnVsZSwK LSAgICAgICAgKkNTU0N1c3RvbUlkZW50VmFsdWU6OmNyZWF0ZShpZGVudC52YWx1ZSgpLnRvU3Ry aW5nKCkpKSk7CisgICAgaWYgKCFtX2NvbnRleHQuY29udGFpbmVyUXVlcmllc0VuYWJsZWQpCisg ICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgaWYgKG1fZGVmZXJyZWRQYXJzZXIpCisgICAg ICAgIHJldHVybiBTdHlsZVJ1bGVDb250YWluZXI6OmNyZWF0ZSh7IH0sIG1ha2VVbmlxdWU8RGVm ZXJyZWRTdHlsZUdyb3VwUnVsZUxpc3Q+KGJsb2NrLCAqbV9kZWZlcnJlZFBhcnNlcikpOworCisg ICAgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPj4gcnVsZXM7CisKKyAgICBpZiAobV9vYnNl cnZlcldyYXBwZXIpIHsKKyAgICAgICAgbV9vYnNlcnZlcldyYXBwZXItPm9ic2VydmVyKCkuc3Rh cnRSdWxlSGVhZGVyKFN0eWxlUnVsZVR5cGU6OkNvbnRhaW5lciwgbV9vYnNlcnZlcldyYXBwZXIt PnN0YXJ0T2Zmc2V0KHByZWx1ZGUpKTsKKyAgICAgICAgbV9vYnNlcnZlcldyYXBwZXItPm9ic2Vy dmVyKCkuZW5kUnVsZUhlYWRlcihtX29ic2VydmVyV3JhcHBlci0+ZW5kT2Zmc2V0KHByZWx1ZGUp KTsKKyAgICAgICAgbV9vYnNlcnZlcldyYXBwZXItPm9ic2VydmVyKCkuc3RhcnRSdWxlQm9keSht X29ic2VydmVyV3JhcHBlci0+cHJldmlvdXNUb2tlblN0YXJ0T2Zmc2V0KGJsb2NrKSk7CisgICAg fQorCisgICAgY29uc3VtZVJ1bGVMaXN0KGJsb2NrLCBSZWd1bGFyUnVsZUxpc3QsIFsmcnVsZXNd KFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiBydWxlKSB7CisgICAgICAgIHJ1bGVzLmFwcGVuZChydWxl KTsKKyAgICB9KTsKKyAgICBydWxlcy5zaHJpbmtUb0ZpdCgpOworCisgICAgaWYgKG1fb2JzZXJ2 ZXJXcmFwcGVyKQorICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5lbmRSdWxl Qm9keShtX29ic2VydmVyV3JhcHBlci0+ZW5kT2Zmc2V0KGJsb2NrKSk7CisKKyAgICByZXR1cm4g U3R5bGVSdWxlQ29udGFpbmVyOjpjcmVhdGUoeyB9LCBXVEZNb3ZlKHJ1bGVzKSk7CiB9Ci0qLwog ICAgIAogUmVmUHRyPFN0eWxlUnVsZUtleWZyYW1lPiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lS2V5 ZnJhbWVTdHlsZVJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlLCBDU1NQYXJzZXJUb2tl blJhbmdlIGJsb2NrKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D U1NQYXJzZXJJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwu aAppbmRleCBkOGNmN2I4NTAxMzdjNDVmM2E0NjllZjMzYjkzYTFiYzFhMGRiZGMyLi4wZDI3M2Y1 OWQwMjZiZWEwODJjZDg1OTIyZjQ5ZTRmOWIyYzFlODIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1BhcnNlckltcGwuaApAQCAtMTQwLDkgKzE0MCw3IEBAIHByaXZhdGU6CiAgICAg UmVmUHRyPFN0eWxlUnVsZVBhZ2U+IGNvbnN1bWVQYWdlUnVsZShDU1NQYXJzZXJUb2tlblJhbmdl IHByZWx1ZGUsIENTU1BhcnNlclRva2VuUmFuZ2UgYmxvY2spOwogICAgIFJlZlB0cjxTdHlsZVJ1 bGVDb3VudGVyU3R5bGU+IGNvbnN1bWVDb3VudGVyU3R5bGVSdWxlKENTU1BhcnNlclRva2VuUmFu Z2UgcHJlbHVkZSwgQ1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jayk7CiAgICAgUmVmUHRyPFN0eWxl UnVsZUxheWVyPiBjb25zdW1lTGF5ZXJSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSwg c3RkOjpvcHRpb25hbDxDU1NQYXJzZXJUb2tlblJhbmdlPiBibG9jayk7Ci0KLSAgICAvLyBGSVhN RS1ORVdQQVJTRVI6IFN1cHBvcnQgImFwcGx5IgotICAgIC8vIHZvaWQgY29uc3VtZUFwcGx5UnVs ZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUpOworICAgIFJlZlB0cjxTdHlsZVJ1bGVDb250 YWluZXI+IGNvbnN1bWVDb250YWluZXJSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSwg Q1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jayk7CiAKICAgICBSZWZQdHI8U3R5bGVSdWxlS2V5ZnJh bWU+IGNvbnN1bWVLZXlmcmFtZVN0eWxlUnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUs IENTU1BhcnNlclRva2VuUmFuZ2UgYmxvY2spOwogICAgIFJlZlB0cjxTdHlsZVJ1bGU+IGNvbnN1 bWVTdHlsZVJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlLCBDU1NQYXJzZXJUb2tlblJh bmdlIGJsb2NrKTsK 446697 2021-12-10 02:39:48 -0800 2021-12-10 05:29:44 -0800 Patch bug-234135-20211210123947.patch text/plain 19565 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDM2OTBkYjZmNDczODRkMDIzYjg3ZjYz MWZjNDBmOWI4ODhlNWIzY2MuLjNmNDM5ZmRhYmJkMDc0MGRlOWVhNmY5Y2YxN2Y4ODU4MjhkMzkz YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMTItMTAgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgQ29udGFpbmVyIFF1ZXJpZXNdIEJhc2ljIEBj b250YWluZXIgYXQtcnVsZSBwYXJzaW5nIHN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJl bmNlc0V4cGVyaW1lbnRhbC55YW1sOgorCisgICAgICAgIEFkZCBwcmVmZXJlbmNlIGZvciBjb250 YWluZXIgcXVlcmllcywgZGlzYWJsZWQgYnkgZGVmYXVsdC4KKwogMjAyMS0xMi0wOSAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIHRoZSBDU1MgQ29udGFp biBwcm9wZXJ0eSBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyOTUzNTU0OTEwMzk4Y2ZiZTk1 YzMzM2U5NzkwZmUyY2IzMTQyZS4uOWEzZGEwNjQ4NmU1ZTFiODM2NTNmNWVkZWYyMDkyZmI3MzYx ZDYyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIxLTEyLTEwICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBRdWVyaWVz XSBCYXNpYyBAY29udGFpbmVyIGF0LXJ1bGUgcGFyc2luZyBzdXBwb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxMzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgYmFzaWMgc3VwcG9y dCBmb3IgcGFyc2luZyBAY29udGFpbmVyIGF0LXJ1bGVzLgorICAgICAgICBUaGlzIHBhdGNoIGRv ZXNuJ3QgeWV0IHBhcnNlIHRoZSBxdWVyaWVzIHRoZW1zZWx2ZXMuCisKKyAgICAgICAgRGlzYWJs ZWQgYnkgZGVmYXVsdC4KKworICAgICAgICAqIGNzcy9TdHlsZVJ1bGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVSdWxlQmFzZTo6ZGVzdHJveSk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZVJ1bGVCYXNlOjpjb3B5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUnVsZUJhc2U6 OmNyZWF0ZUNTU09NV3JhcHBlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1bGVD b250YWluZXI6OlN0eWxlUnVsZUNvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1 bGVDb250YWluZXI6OmNyZWF0ZSk6CisgICAgICAgICogY3NzL1N0eWxlUnVsZS5oOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSdWxlQmFzZTo6aXNDb250YWluZXJSdWxlIGNvbnN0KToKKyAgICAg ICAgKGlzVHlwZSk6CisgICAgICAgICogY3NzL1N0eWxlUnVsZVR5cGUuaDoKKyAgICAgICAgKiBj c3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYXZlcnNlUnVs ZXNJblZlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVNoZWV0Q29udGVudHM6OnRyYXZl cnNlU3VicmVzb3VyY2VzIGNvbnN0KToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU0F0UnVsZUlE LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNzc0F0UnVsZUlEKToKKyAgICAgICAgKiBjc3MvcGFy c2VyL0NTU0F0UnVsZUlELmg6CisgICAgICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJhdG9yPT0pOgorICAgICAgICAoV2ViQ29yZTo6 YWRkKToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlckNvbnRleHQuaDoKKyAgICAgICAg KiBjc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFy c2VySW1wbDo6Y29uc3VtZUF0UnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXJJbXBs Ojpjb25zdW1lQ29udGFpbmVyUnVsZSk6CisgICAgICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJJ bXBsLmg6CisKIDIwMjEtMTItMTAgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNv bT4KIAogICAgICAgICBJT1N1cmZhY2UgbWVtb3J5IGF0dHJpYnV0aW9uIGlzIGhhcmQgdG8gdXNl IGluIGNvbnN0cnVjdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVu Y2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwgYi9Tb3VyY2UvV1RGL1NjcmlwdHMv UHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbAppbmRleCA4OGJhYmFh YjUwM2ZlNGM2OWFhYTQwMzMyODFlNjQ0MDYyMWM1MDBmLi45ZTI3NGExYTQ2Y2NjMTY0MmFmM2Jm MzNhYjExZDg2YTEzMTExODE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVy ZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbAorKysgYi9Tb3VyY2UvV1RGL1Nj cmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbApAQCAtMjI0 LDYgKzIyNCwxOCBAQCBDU1NDb2xvck1peEVuYWJsZWQ6CiAgICAgV2ViQ29yZToKICAgICAgIGRl ZmF1bHQ6IGZhbHNlCiAKK0NTU0NvbnRhaW5lclF1ZXJpZXNFbmFibGVkOgorICB0eXBlOiBib29s CisgIGh1bWFuUmVhZGFibGVOYW1lOiAiQ1NTIENvbnRhaW5lciBRdWVyaWVzIgorICBodW1hblJl YWRhYmxlRGVzY3JpcHRpb246ICJFbmFibGUgQ1NTIENvbnRhaW5lciBRdWVyaWVzIgorICBkZWZh dWx0VmFsdWU6CisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBX ZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6CisgICAgICBkZWZhdWx0 OiBmYWxzZQorCiBDU1NDb250YWlubWVudEVuYWJsZWQ6CiAgIHR5cGU6IGJvb2wKICAgaHVtYW5S ZWFkYWJsZU5hbWU6ICJDU1MgQ29udGFpbm1lbnQiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSdWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3BwCmlu ZGV4IDg4ZjAyY2I4YTdmZmQ2OTQ4ZGJkYmQzMjE5M2UzY2JhYzkwMTdhYTUuLjdiYTNhZGE4NTE5 ZTk0ZTIwYmZiZGEyNDA3YTI2ZDYwMzA2N2ViOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJ1bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3Bw CkBAIC0xMDQsNiArMTA0LDkgQEAgdm9pZCBTdHlsZVJ1bGVCYXNlOjpkZXN0cm95KCkKICAgICBj YXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyU3RhdGVtZW50OgogICAgICAgICBkZWxldGUgZG93bmNh c3Q8U3R5bGVSdWxlTGF5ZXI+KHRoaXMpOwogICAgICAgICByZXR1cm47CisgICAgY2FzZSBTdHls ZVJ1bGVUeXBlOjpDb250YWluZXI6CisgICAgICAgIGRlbGV0ZSBkb3duY2FzdDxTdHlsZVJ1bGVD b250YWluZXI+KHRoaXMpOworICAgICAgICByZXR1cm47CiAgICAgY2FzZSBTdHlsZVJ1bGVUeXBl OjpVbmtub3duOgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJu OwpAQCAtMTMzLDYgKzEzNiw4IEBAIFJlZjxTdHlsZVJ1bGVCYXNlPiBTdHlsZVJ1bGVCYXNlOjpj b3B5KCkgY29uc3QKICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyQmxvY2s6CiAgICAgY2Fz ZSBTdHlsZVJ1bGVUeXBlOjpMYXllclN0YXRlbWVudDoKICAgICAgICAgcmV0dXJuIGRvd25jYXN0 PFN0eWxlUnVsZUxheWVyPigqdGhpcykuY29weSgpOworICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6 Q29udGFpbmVyOgorICAgICAgICByZXR1cm4gZG93bmNhc3Q8U3R5bGVSdWxlQ29udGFpbmVyPigq dGhpcykuY29weSgpOwogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6SW1wb3J0OgogICAgIGNhc2Ug U3R5bGVSdWxlVHlwZTo6TmFtZXNwYWNlOgogICAgICAgICAvLyBGSVhNRTogQ29weSBpbXBvcnQg YW5kIG5hbWVzcGFjZSBydWxlcy4KQEAgLTE4Niw2ICsxOTEsOSBAQCBSZWY8Q1NTUnVsZT4gU3R5 bGVSdWxlQmFzZTo6Y3JlYXRlQ1NTT01XcmFwcGVyKENTU1N0eWxlU2hlZXQqIHBhcmVudFNoZWV0 LCBDU1NSdQogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6TGF5ZXJTdGF0ZW1lbnQ6CiAgICAgICAg IHJ1bGUgPSBDU1NMYXllclN0YXRlbWVudFJ1bGU6OmNyZWF0ZShkb3duY2FzdDxTdHlsZVJ1bGVM YXllcj4oc2VsZiksIHBhcmVudFNoZWV0KTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBTdHls ZVJ1bGVUeXBlOjpDb250YWluZXI6CisgICAgICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgQ1NTT00u CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6VW5rbm93bjoKICAgICBj YXNlIFN0eWxlUnVsZVR5cGU6OkNoYXJzZXQ6CiAgICAgY2FzZSBTdHlsZVJ1bGVUeXBlOjpLZXlm cmFtZToKQEAgLTM2Miw2ICszNzAsOCBAQCBEZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlzdDo6RGVm ZXJyZWRTdHlsZUdyb3VwUnVsZUxpc3QoY29uc3QgQ1NTUGFyc2VyVG9rZW5SYW5nZQogICAgIG1f dG9rZW5zLmFwcGVuZChyYW5nZS5iZWdpbigpLCBsZW5ndGgpOwogfQogCitEZWZlcnJlZFN0eWxl R3JvdXBSdWxlTGlzdDo6fkRlZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0KCkgPSBkZWZhdWx0Owor CiB2b2lkIERlZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0OjpwYXJzZURlZmVycmVkUnVsZXMoVmVj dG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPj4mIGNoaWxkUnVsZXMpCiB7CiAgICAgbV9wYXJzZXIt PnBhcnNlUnVsZUxpc3QobV90b2tlbnMsIGNoaWxkUnVsZXMpOwpAQCAtNTIzLDYgKzUzMywzNCBA QCBSZWY8U3R5bGVSdWxlTGF5ZXI+IFN0eWxlUnVsZUxheWVyOjpjcmVhdGVCbG9jayhDYXNjYWRl TGF5ZXJOYW1lJiYgbmFtZSwgc3RkOjp1bgogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFN0eWxl UnVsZUxheWVyKFdURk1vdmUobmFtZSksIFdURk1vdmUocnVsZXMpKSk7CiB9CiAKK1N0eWxlUnVs ZUNvbnRhaW5lcjo6U3R5bGVSdWxlQ29udGFpbmVyKENvbnRhaW5lclF1ZXJ5JiYgcXVlcnksIFZl Y3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiYgcnVsZXMpCisgICAgOiBTdHlsZVJ1bGVHcm91 cChTdHlsZVJ1bGVUeXBlOjpDb250YWluZXIsIFdURk1vdmUocnVsZXMpKQorICAgICwgbV9xdWVy eShXVEZNb3ZlKHF1ZXJ5KSkKK3sKK30KKworU3R5bGVSdWxlQ29udGFpbmVyOjpTdHlsZVJ1bGVD b250YWluZXIoQ29udGFpbmVyUXVlcnkmJiBxdWVyeSwgc3RkOjp1bmlxdWVfcHRyPERlZmVycmVk U3R5bGVHcm91cFJ1bGVMaXN0PiYmIHJ1bGVzKQorICAgIDogU3R5bGVSdWxlR3JvdXAoU3R5bGVS dWxlVHlwZTo6Q29udGFpbmVyLCBXVEZNb3ZlKHJ1bGVzKSkKKyAgICAsIG1fcXVlcnkoV1RGTW92 ZShxdWVyeSkpCit7Cit9CisKK1N0eWxlUnVsZUNvbnRhaW5lcjo6U3R5bGVSdWxlQ29udGFpbmVy KGNvbnN0IFN0eWxlUnVsZUNvbnRhaW5lciYgb3RoZXIpCisgICAgOiBTdHlsZVJ1bGVHcm91cChv dGhlcikKKyAgICAsIG1fcXVlcnkob3RoZXIubV9xdWVyeSkKK3sKK30KKworUmVmPFN0eWxlUnVs ZUNvbnRhaW5lcj4gU3R5bGVSdWxlQ29udGFpbmVyOjpjcmVhdGUoQ29udGFpbmVyUXVlcnkmJiBx dWVyeSwgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPj4mJiBydWxlcykKK3sKKyAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBTdHlsZVJ1bGVDb250YWluZXIoV1RGTW92ZShxdWVyeSksIFdURk1v dmUocnVsZXMpKSk7Cit9CisKK1JlZjxTdHlsZVJ1bGVDb250YWluZXI+IFN0eWxlUnVsZUNvbnRh aW5lcjo6Y3JlYXRlKENvbnRhaW5lclF1ZXJ5JiYgcXVlcnksIHN0ZDo6dW5pcXVlX3B0cjxEZWZl cnJlZFN0eWxlR3JvdXBSdWxlTGlzdD4mJiBydWxlcykKK3sKKyAgICByZXR1cm4gYWRvcHRSZWYo Km5ldyBTdHlsZVJ1bGVDb250YWluZXIoV1RGTW92ZShxdWVyeSksIFdURk1vdmUocnVsZXMpKSk7 Cit9CisKIFN0eWxlUnVsZUNoYXJzZXQ6OlN0eWxlUnVsZUNoYXJzZXQoKQogICAgIDogU3R5bGVS dWxlQmFzZShTdHlsZVJ1bGVUeXBlOjpDaGFyc2V0KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUnVsZS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5oCmlu ZGV4IDQ4ZGMxMjg0MDcyMGExYTE3NjlhYzUxMzYwM2EwNzJkNTE5ZWFhNzIuLmNkMTVmODdhMzI1 ZTUzZTIwZGU3ZmEyODIwZTgzZDBmYTIyMDcwMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJ1bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKQEAg LTYwLDEwICs2MCwxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc01lZGlhUnVsZSgpIGNvbnN0IHsg cmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpNZWRpYTsgfQogICAgIGJvb2wgaXNQYWdl UnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpQYWdlOyB9CiAg ICAgYm9vbCBpc1N0eWxlUnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVU eXBlOjpTdHlsZTsgfQotICAgIGJvb2wgaXNHcm91cFJ1bGUoKSBjb25zdCB7IHJldHVybiB0eXBl KCkgPT0gU3R5bGVSdWxlVHlwZTo6TWVkaWEgfHwgdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6OlN1 cHBvcnRzIHx8IHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpMYXllckJsb2NrOyB9CisgICAgYm9v bCBpc0dyb3VwUnVsZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpN ZWRpYSB8fCB0eXBlKCkgPT0gU3R5bGVSdWxlVHlwZTo6U3VwcG9ydHMgfHwgdHlwZSgpID09IFN0 eWxlUnVsZVR5cGU6OkxheWVyQmxvY2sgfHwgdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6OkNvbnRh aW5lcjsgfQogICAgIGJvb2wgaXNTdXBwb3J0c1J1bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkg PT0gU3R5bGVSdWxlVHlwZTo6U3VwcG9ydHM7IH0KICAgICBib29sIGlzSW1wb3J0UnVsZSgpIGNv bnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBTdHlsZVJ1bGVUeXBlOjpJbXBvcnQ7IH0KICAgICBib29s IGlzTGF5ZXJSdWxlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6Okxh eWVyQmxvY2sgfHwgdHlwZSgpID09IFN0eWxlUnVsZVR5cGU6OkxheWVyU3RhdGVtZW50OyB9Cisg ICAgYm9vbCBpc0NvbnRhaW5lclJ1bGUoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0gU3R5bGVS dWxlVHlwZTo6Q29udGFpbmVyOyB9CiAKICAgICBSZWY8U3R5bGVSdWxlQmFzZT4gY29weSgpIGNv bnN0OwogCkBAIC0yMjgsNiArMjI5LDcgQEAgY2xhc3MgRGVmZXJyZWRTdHlsZUdyb3VwUnVsZUxp c3QgZmluYWwgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIERl ZmVycmVkU3R5bGVHcm91cFJ1bGVMaXN0KGNvbnN0IENTU1BhcnNlclRva2VuUmFuZ2UmLCBDU1NE ZWZlcnJlZFBhcnNlciYpOworICAgIH5EZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlzdCgpOwogICAg IAogICAgIHZvaWQgcGFyc2VEZWZlcnJlZFJ1bGVzKFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFz ZT4+Jik7CiAgICAgdm9pZCBwYXJzZURlZmVycmVkS2V5ZnJhbWVzKFN0eWxlUnVsZUtleWZyYW1l cyYpOwpAQCAtMzEyLDYgKzMxNCwyNCBAQCBwcml2YXRlOgogICAgIHN0ZDo6dmFyaWFudDxDYXNj YWRlTGF5ZXJOYW1lLCBWZWN0b3I8Q2FzY2FkZUxheWVyTmFtZT4+IG1fbmFtZVZhcmlhbnQ7CiB9 OwogCitzdHJ1Y3QgQ29udGFpbmVyUXVlcnkgeyB9OworCitjbGFzcyBTdHlsZVJ1bGVDb250YWlu ZXIgZmluYWwgOiBwdWJsaWMgU3R5bGVSdWxlR3JvdXAgeworcHVibGljOgorICAgIHN0YXRpYyBS ZWY8U3R5bGVSdWxlQ29udGFpbmVyPiBjcmVhdGUoQ29udGFpbmVyUXVlcnkmJiwgVmVjdG9yPFJl ZlB0cjxTdHlsZVJ1bGVCYXNlPj4mJik7CisgICAgc3RhdGljIFJlZjxTdHlsZVJ1bGVDb250YWlu ZXI+IGNyZWF0ZShDb250YWluZXJRdWVyeSYmLCBzdGQ6OnVuaXF1ZV9wdHI8RGVmZXJyZWRTdHls ZUdyb3VwUnVsZUxpc3Q+JiYpOworICAgIFJlZjxTdHlsZVJ1bGVDb250YWluZXI+IGNvcHkoKSBj b25zdCB7IHJldHVybiBhZG9wdFJlZigqbmV3IFN0eWxlUnVsZUNvbnRhaW5lcigqdGhpcykpOyB9 CisKKyAgICBjb25zdCBDb250YWluZXJRdWVyeSYgcXVlcnkoKSBjb25zdCB7IHJldHVybiBtX3F1 ZXJ5OyB9CisKK3ByaXZhdGU6CisgICAgU3R5bGVSdWxlQ29udGFpbmVyKENvbnRhaW5lclF1ZXJ5 JiYsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4+JiYpOworICAgIFN0eWxlUnVsZUNvbnRh aW5lcihDb250YWluZXJRdWVyeSYmLCBzdGQ6OnVuaXF1ZV9wdHI8RGVmZXJyZWRTdHlsZUdyb3Vw UnVsZUxpc3Q+JiYpOworICAgIFN0eWxlUnVsZUNvbnRhaW5lcihjb25zdCBTdHlsZVJ1bGVDb250 YWluZXImKTsKKworICAgIENvbnRhaW5lclF1ZXJ5IG1fcXVlcnk7Cit9OworCiAvLyBUaGlzIGlz IG9ubHkgdXNlZCBieSB0aGUgQ1NTIHBhcnNlci4KIGNsYXNzIFN0eWxlUnVsZUNoYXJzZXQgZmlu YWwgOiBwdWJsaWMgU3R5bGVSdWxlQmFzZSB7CiBwdWJsaWM6CkBAIC00MzUsMyArNDU1LDcgQEAg U1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQogU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CRUdJ TihXZWJDb3JlOjpTdHlsZVJ1bGVMYXllcikKICAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3Qg V2ViQ29yZTo6U3R5bGVSdWxlQmFzZSYgcnVsZSkgeyByZXR1cm4gcnVsZS5pc0xheWVyUnVsZSgp OyB9CiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCisKK1NQRUNJQUxJWkVfVFlQRV9UUkFJ VFNfQkVHSU4oV2ViQ29yZTo6U3R5bGVSdWxlQ29udGFpbmVyKQorICAgIHN0YXRpYyBib29sIGlz VHlwZShjb25zdCBXZWJDb3JlOjpTdHlsZVJ1bGVCYXNlJiBydWxlKSB7IHJldHVybiBydWxlLmlz Q29udGFpbmVyUnVsZSgpOyB9CitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlVHlwZS5oIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlUnVsZVR5cGUuaAppbmRleCAzNjg0NjVkNmY0NzRlYjNlNzExMjIyMzc3ZTBiY2Ex MzRhMTkzYmUzLi5kZTEwODhhYTdiYWU2OTNjODdjOWVhMzA4NTVlNjhkNTM3OGZiZmMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlVHlwZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJ1bGVUeXBlLmgKQEAgLTQyLDYgKzQyLDcgQEAgZW51bSBjbGFzcyBT dHlsZVJ1bGVUeXBlIDogdWludDhfdCB7CiAgICAgU3VwcG9ydHMgPSAxMiwKICAgICBMYXllckJs b2NrID0gMTYsCiAgICAgTGF5ZXJTdGF0ZW1lbnQgPSAxNywKKyAgICBDb250YWluZXIgPSAxOCwK ICAgICBGb250UGFsZXR0ZVZhbHVlcyA9IDE5LAogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlU2hlZXRDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVTaGVldENvbnRlbnRzLmNwcAppbmRleCBhYzVkMDkzYWY2NDZmY2ViYWI1ZTM0MGE1Yjc4ZGRk MWRmZjRiZDIyLi4zMDFjMzVlYjcwY2U2YzI5OGRlOTVmNGIyMGVmMmY5OWFhMjI2ZTc5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcApAQCAtNDU4LDcgKzQ1OCw4 IEBAIHN0YXRpYyBib29sIHRyYXZlcnNlUnVsZXNJblZlY3Rvcihjb25zdCBWZWN0b3I8UmVmUHRy PFN0eWxlUnVsZUJhc2U+PiYgcnVsZXMsIGNvCiAgICAgICAgIHN3aXRjaCAocnVsZS0+dHlwZSgp KSB7CiAgICAgICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6TWVkaWE6CiAgICAgICAgIGNhc2UgU3R5 bGVSdWxlVHlwZTo6U3VwcG9ydHM6Ci0gICAgICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6TGF5ZXJC bG9jazogeworICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OkxheWVyQmxvY2s6CisgICAgICAg IGNhc2UgU3R5bGVSdWxlVHlwZTo6Q29udGFpbmVyOiB7CiAgICAgICAgICAgICBhdXRvKiBjaGls ZFJ1bGVzID0gZG93bmNhc3Q8U3R5bGVSdWxlR3JvdXA+KCpydWxlKS5jaGlsZFJ1bGVzV2l0aG91 dERlZmVycmVkUGFyc2luZygpOwogICAgICAgICAgICAgaWYgKGNoaWxkUnVsZXMgJiYgdHJhdmVy c2VSdWxlc0luVmVjdG9yKCpjaGlsZFJ1bGVzLCBoYW5kbGVyKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKQEAgLTUyMiw2ICs1MjMsNyBAQCBib29sIFN0eWxlU2hlZXRDb250ZW50czo6 dHJhdmVyc2VTdWJyZXNvdXJjZXMoY29uc3QgRnVuY3Rpb248Ym9vbChjb25zdCBDYWNoZWRSZQog ICAgICAgICBjYXNlIFN0eWxlUnVsZVR5cGU6OlN1cHBvcnRzOgogICAgICAgICBjYXNlIFN0eWxl UnVsZVR5cGU6OkxheWVyQmxvY2s6CiAgICAgICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6TGF5ZXJT dGF0ZW1lbnQ6CisgICAgICAgIGNhc2UgU3R5bGVSdWxlVHlwZTo6Q29udGFpbmVyOgogICAgICAg ICBjYXNlIFN0eWxlUnVsZVR5cGU6OkZvbnRQYWxldHRlVmFsdWVzOgogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NBdFJ1bGVJRC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU0F0UnVs ZUlELmNwcAppbmRleCBlN2U3NGQ0ZWRmZDg3YzRkN2M5ZWI1NDc3YzdlODJjM2I1Mjc5OWNmLi4y NDhmOWVmNWZiOWM2ODRkY2E0MmVjMGRkYTJlMGYzYzE1YmE3ZWJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmNwcApAQCAtNTYsMTIgKzU2LDEyIEBAIENTU0F0UnVs ZUlEIGNzc0F0UnVsZUlEKFN0cmluZ1ZpZXcgbmFtZSkKICAgICAgICAgcmV0dXJuIENTU0F0UnVs ZVZpZXdwb3J0OwogICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICItd2Via2l0 LWtleWZyYW1lcyIpKQogICAgICAgICByZXR1cm4gQ1NTQXRSdWxlV2Via2l0S2V5ZnJhbWVzOwot ICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5hbWUsICJhcHBseSIpKQotICAgICAgICBy ZXR1cm4gQ1NTQXRSdWxlQXBwbHk7CiAgICAgaWYgKGVxdWFsSWdub3JpbmdBU0NJSUNhc2UobmFt ZSwgImNvdW50ZXItc3R5bGUiKSkKICAgICAgICAgcmV0dXJuIENTU0F0UnVsZUNvdW50ZXJTdHls ZTsKICAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuYW1lLCAibGF5ZXIiKSkKICAgICAg ICAgcmV0dXJuIENTU0F0UnVsZUxheWVyOworICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNl KG5hbWUsICJjb250YWluZXIiKSkKKyAgICAgICAgcmV0dXJuIENTU0F0UnVsZUNvbnRhaW5lcjsK ICAgICByZXR1cm4gQ1NTQXRSdWxlSW52YWxpZDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NBdFJ1bGVJRC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNl ci9DU1NBdFJ1bGVJRC5oCmluZGV4IGU2NmMwNDM3N2RjNDllNDA2ODdjZGY2YzJjNmU1NGZkOGUw ODUzZjIuLmRjYWU3OTZmZjAwMTc1NTc3MDU3MmFkMzk0YmNkNmE2Yjg3MzAwODAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTQXRSdWxlSUQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvcGFyc2VyL0NTU0F0UnVsZUlELmgKQEAgLTM1LDIyICszNSwyMiBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBlbnVtIENTU0F0UnVsZUlEIHsKICAgICBDU1NBdFJ1bGVJbnZhbGlk ID0gMCwKIAotICAgIENTU0F0UnVsZUNoYXJzZXQgPSAxLAotICAgIENTU0F0UnVsZUZvbnRGYWNl ID0gMiwKLSAgICBDU1NBdFJ1bGVJbXBvcnQgPSAzLAotICAgIENTU0F0UnVsZUtleWZyYW1lcyA9 IDQsCi0gICAgQ1NTQXRSdWxlTWVkaWEgPSA1LAotICAgIENTU0F0UnVsZU5hbWVzcGFjZSA9IDYs Ci0gICAgQ1NTQXRSdWxlUGFnZSA9IDcsCi0gICAgQ1NTQXRSdWxlU3VwcG9ydHMgPSA4LAotICAg IENTU0F0UnVsZVZpZXdwb3J0ID0gOSwKLQotICAgIENTU0F0UnVsZVdlYmtpdEtleWZyYW1lcyA9 IDEwLAotICAgIENTU0F0UnVsZUFwcGx5ID0gMTEsCi0gICAgQ1NTQXRSdWxlQ291bnRlclN0eWxl ID0gMTIsCi0gICAgQ1NTQXRSdWxlTGF5ZXIgPSAxMywKLQotICAgIENTU0F0UnVsZUZvbnRQYWxl dHRlVmFsdWVzID0gMTQsCisgICAgQ1NTQXRSdWxlQ2hhcnNldCwKKyAgICBDU1NBdFJ1bGVGb250 RmFjZSwKKyAgICBDU1NBdFJ1bGVJbXBvcnQsCisgICAgQ1NTQXRSdWxlS2V5ZnJhbWVzLAorICAg IENTU0F0UnVsZU1lZGlhLAorICAgIENTU0F0UnVsZU5hbWVzcGFjZSwKKyAgICBDU1NBdFJ1bGVQ YWdlLAorICAgIENTU0F0UnVsZVN1cHBvcnRzLAorICAgIENTU0F0UnVsZVZpZXdwb3J0LAorCisg ICAgQ1NTQXRSdWxlV2Via2l0S2V5ZnJhbWVzLAorICAgIENTU0F0UnVsZUNvdW50ZXJTdHlsZSwK KyAgICBDU1NBdFJ1bGVMYXllciwKKyAgICBDU1NBdFJ1bGVDb250YWluZXIsCisKKyAgICBDU1NB dFJ1bGVGb250UGFsZXR0ZVZhbHVlcywKIH07CiAKIENTU0F0UnVsZUlEIGNzc0F0UnVsZUlEKFN0 cmluZ1ZpZXcgbmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1BhcnNlckNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJD b250ZXh0LmNwcAppbmRleCBhODYwNGEwNmFmOTRkZThlNWM4NTRlNTlmYmI1MTEyZjU2NWEwNDk3 Li5mMzIyOTZlYmNjZTI4ZGNhYjRkZDZlNGJiOTI3MTA4MzQ1ZjFhZDUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckNvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyQ29udGV4dC5jcHAKQEAgLTEwNSw2ICsxMDUs NyBAQCBDU1NQYXJzZXJDb250ZXh0OjpDU1NQYXJzZXJDb250ZXh0KGNvbnN0IERvY3VtZW50JiBk b2N1bWVudCwgY29uc3QgVVJMJiBzaGVldEJhcwogICAgICwgZm9jdXNWaXNpYmxlRW5hYmxlZCB7 IGRvY3VtZW50LnNldHRpbmdzKCkuZm9jdXNWaXNpYmxlRW5hYmxlZCgpIH0KICAgICAsIGhhc1Bz ZXVkb0NsYXNzRW5hYmxlZCB7IGRvY3VtZW50LnNldHRpbmdzKCkuaGFzUHNldWRvQ2xhc3NFbmFi bGVkKCkgfQogICAgICwgY2FzY2FkZUxheWVyc0VuYWJsZWQgeyBkb2N1bWVudC5zZXR0aW5ncygp LmNzc0Nhc2NhZGVMYXllcnNFbmFibGVkKCkgfQorICAgICwgY29udGFpbmVyUXVlcmllc0VuYWJs ZWQgeyBkb2N1bWVudC5zZXR0aW5ncygpLmNzc0NvbnRhaW5lclF1ZXJpZXNFbmFibGVkKCkgfQog I2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAgICAgLCBhdHRhY2htZW50RW5hYmxlZCB7 IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuYXR0YWNobWVudEVsZW1l bnRFbmFibGVkKCkgfQogI2VuZGlmCkBAIC0xNTEsNiArMTUyLDcgQEAgYm9vbCBvcGVyYXRvcj09 KGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGEsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGIpCiAg ICAgICAgICYmIGEuZm9jdXNWaXNpYmxlRW5hYmxlZCA9PSBiLmZvY3VzVmlzaWJsZUVuYWJsZWQK ICAgICAgICAgJiYgYS5oYXNQc2V1ZG9DbGFzc0VuYWJsZWQgPT0gYi5oYXNQc2V1ZG9DbGFzc0Vu YWJsZWQKICAgICAgICAgJiYgYS5jYXNjYWRlTGF5ZXJzRW5hYmxlZCA9PSBiLmNhc2NhZGVMYXll cnNFbmFibGVkCisgICAgICAgICYmIGEuY29udGFpbmVyUXVlcmllc0VuYWJsZWQgPT0gYi5jb250 YWluZXJRdWVyaWVzRW5hYmxlZAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAgICAg ICAgICYmIGEuYXR0YWNobWVudEVuYWJsZWQgPT0gYi5hdHRhY2htZW50RW5hYmxlZAogI2VuZGlm CkBAIC0xOTAsMTIgKzE5MiwxMyBAQCB2b2lkIGFkZChIYXNoZXImIGhhc2hlciwgY29uc3QgQ1NT UGFyc2VyQ29udGV4dCYgY29udGV4dCkKICAgICAgICAgfCBjb250ZXh0LmZvY3VzVmlzaWJsZUVu YWJsZWQgICAgICAgICAgICAgICAgICAgICAgIDw8IDIxCiAgICAgICAgIHwgY29udGV4dC5oYXNQ c2V1ZG9DbGFzc0VuYWJsZWQgICAgICAgICAgICAgICAgICAgICA8PCAyMgogICAgICAgICB8IGNv bnRleHQuY2FzY2FkZUxheWVyc0VuYWJsZWQgICAgICAgICAgICAgICAgICAgICAgPDwgMjMKKyAg ICAgICAgfCBjb250ZXh0LmNvbnRhaW5lclF1ZXJpZXNFbmFibGVkICAgICAgICAgICAgICAgICAg IDw8IDI0CiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKLSAgICAgICAgfCBjb250ZXh0 LmF0dGFjaG1lbnRFbmFibGVkICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDI0CisgICAgICAg IHwgY29udGV4dC5hdHRhY2htZW50RW5hYmxlZCAgICAgICAgICAgICAgICAgICAgICAgICA8PCAy NQogI2VuZGlmCi0gICAgICAgIHwgY29udGV4dC5vdmVyZmxvd0NsaXBFbmFibGVkICAgICAgICAg ICAgICAgICAgICAgICA8PCAyNQotICAgICAgICB8IGNvbnRleHQuYWNjZW50Q29sb3JFbmFibGVk ICAgICAgICAgICAgICAgICAgICAgICAgPDwgMjYKLSAgICAgICAgfCBjb250ZXh0Lm1vZGUgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDI3OyAvLyBUaGlzIGlzIG11bHRp cGxlIGJpdHMsIHNvIGtlZXAgaXQgbGFzdC4KKyAgICAgICAgfCBjb250ZXh0Lm92ZXJmbG93Q2xp cEVuYWJsZWQgICAgICAgICAgICAgICAgICAgICAgIDw8IDI2CisgICAgICAgIHwgY29udGV4dC5h Y2NlbnRDb2xvckVuYWJsZWQgICAgICAgICAgICAgICAgICAgICAgICA8PCAyNworICAgICAgICB8 IGNvbnRleHQubW9kZSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPDwgMjg7 IC8vIFRoaXMgaXMgbXVsdGlwbGUgYml0cywgc28ga2VlcCBpdCBsYXN0LgogICAgIGFkZChoYXNo ZXIsIGNvbnRleHQuYmFzZVVSTCwgY29udGV4dC5jaGFyc2V0LCBiaXRzKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckNvbnRleHQuaAppbmRleCA3OWYxMWU5NDAz OGE2ODZmM2E2Mzg4ZWRjMjA5NTQ2ZjljNDkxNjYyLi4yYjkxZDE1ZTMxMDI0OWQ4ODM2Zjc5NTQ3 MWY0OWU1OTQyMzE1NWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1BhcnNlckNvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNl ckNvbnRleHQuaApAQCAtODQsNiArODQsNyBAQCBzdHJ1Y3QgQ1NTUGFyc2VyQ29udGV4dCB7CiAg ICAgYm9vbCBmb2N1c1Zpc2libGVFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIGhhc1BzZXVk b0NsYXNzRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBjYXNjYWRlTGF5ZXJzRW5hYmxlZCB7 IGZhbHNlIH07CisgICAgYm9vbCBjb250YWluZXJRdWVyaWVzRW5hYmxlZCB7IGZhbHNlIH07CiAK ICAgICAvLyBSdW50aW1lRW5hYmxlZEZlYXR1cmVzLgogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VM RU1FTlQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlcklt cGwuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAppbmRl eCA0NTY0MWI1ZjZiOGUxYTdjMzA4MjYzODAxM2I5YTJhZTUwZDQzMWMyLi5hYmM0NjVhNGMyYTRj MjhiZmZmYzZjODk3YTFmYWM2MjAyNTYwZTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VySW1wbC5jcHAKQEAgLTQ2NSw2ICs0NjUsOCBAQCBSZWZQdHI8U3R5bGVSdWxl QmFzZT4gQ1NTUGFyc2VySW1wbDo6Y29uc3VtZUF0UnVsZShDU1NQYXJzZXJUb2tlblJhbmdlJiBy YW5nZSwgQQogICAgICAgICByZXR1cm4gY29uc3VtZUNvdW50ZXJTdHlsZVJ1bGUocHJlbHVkZSwg YmxvY2spOwogICAgIGNhc2UgQ1NTQXRSdWxlTGF5ZXI6CiAgICAgICAgIHJldHVybiBjb25zdW1l TGF5ZXJSdWxlKHByZWx1ZGUsIGJsb2NrKTsKKyAgICBjYXNlIENTU0F0UnVsZUNvbnRhaW5lcjoK KyAgICAgICAgcmV0dXJuIGNvbnN1bWVDb250YWluZXJSdWxlKHByZWx1ZGUsIGJsb2NrKTsKICAg ICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gbnVsbHB0cjsgLy8gUGFyc2UgZXJyb3IsIHVucmVj b2duaXNlZCBhdC1ydWxlIHdpdGggYmxvY2sKICAgICB9CkBAIC04NTUsMTcgKzg1NywzMiBAQCBS ZWZQdHI8U3R5bGVSdWxlTGF5ZXI+IENTU1BhcnNlckltcGw6OmNvbnN1bWVMYXllclJ1bGUoQ1NT UGFyc2VyVG9rZW5SYW5nZSBwcmVsdQogICAgIHJldHVybiBTdHlsZVJ1bGVMYXllcjo6Y3JlYXRl QmxvY2soV1RGTW92ZSgqbmFtZSksIFdURk1vdmUocnVsZXMpKTsKIH0KIAotLy8gRklYTUUtTkVX UEFSU0VSOiBTdXBwb3J0ICJhcHBseSIKLS8qdm9pZCBDU1NQYXJzZXJJbXBsOjpjb25zdW1lQXBw bHlSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSkKK1JlZlB0cjxTdHlsZVJ1bGVDb250 YWluZXI+IENTU1BhcnNlckltcGw6OmNvbnN1bWVDb250YWluZXJSdWxlKENTU1BhcnNlclRva2Vu UmFuZ2UgcHJlbHVkZSwgQ1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jaykKIHsKLSAgICBjb25zdCBD U1NQYXJzZXJUb2tlbiYgaWRlbnQgPSBwcmVsdWRlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNl KCk7Ci0gICAgaWYgKCFwcmVsdWRlLmF0RW5kKCkgfHwgIUNTU1ZhcmlhYmxlUGFyc2VyOjppc1Zh bGlkVmFyaWFibGVOYW1lKGlkZW50KSkKLSAgICAgICAgcmV0dXJuOyAvLyBQYXJzZSBlcnJvciwg ZXhwZWN0ZWQgYSBzaW5nbGUgY3VzdG9tIHByb3BlcnR5IG5hbWUKLSAgICBtX3BhcnNlZFByb3Bl cnRpZXMuYXBwZW5kKENTU1Byb3BlcnR5KAotICAgICAgICBDU1NQcm9wZXJ0eUFwcGx5QXRSdWxl LAotICAgICAgICAqQ1NTQ3VzdG9tSWRlbnRWYWx1ZTo6Y3JlYXRlKGlkZW50LnZhbHVlKCkudG9T dHJpbmcoKSkpKTsKKyAgICBpZiAoIW1fY29udGV4dC5jb250YWluZXJRdWVyaWVzRW5hYmxlZCkK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAobV9kZWZlcnJlZFBhcnNlcikKKyAg ICAgICAgcmV0dXJuIFN0eWxlUnVsZUNvbnRhaW5lcjo6Y3JlYXRlKHsgfSwgbWFrZVVuaXF1ZTxE ZWZlcnJlZFN0eWxlR3JvdXBSdWxlTGlzdD4oYmxvY2ssICptX2RlZmVycmVkUGFyc2VyKSk7CisK KyAgICBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+PiBydWxlczsKKworICAgIGlmIChtX29i c2VydmVyV3JhcHBlcikgeworICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5z dGFydFJ1bGVIZWFkZXIoU3R5bGVSdWxlVHlwZTo6Q29udGFpbmVyLCBtX29ic2VydmVyV3JhcHBl ci0+c3RhcnRPZmZzZXQocHJlbHVkZSkpOworICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2Jz ZXJ2ZXIoKS5lbmRSdWxlSGVhZGVyKG1fb2JzZXJ2ZXJXcmFwcGVyLT5lbmRPZmZzZXQocHJlbHVk ZSkpOworICAgICAgICBtX29ic2VydmVyV3JhcHBlci0+b2JzZXJ2ZXIoKS5zdGFydFJ1bGVCb2R5 KG1fb2JzZXJ2ZXJXcmFwcGVyLT5wcmV2aW91c1Rva2VuU3RhcnRPZmZzZXQoYmxvY2spKTsKKyAg ICB9CisKKyAgICBjb25zdW1lUnVsZUxpc3QoYmxvY2ssIFJlZ3VsYXJSdWxlTGlzdCwgWyZydWxl c10oUmVmUHRyPFN0eWxlUnVsZUJhc2U+IHJ1bGUpIHsKKyAgICAgICAgcnVsZXMuYXBwZW5kKHJ1 bGUpOworICAgIH0pOworICAgIHJ1bGVzLnNocmlua1RvRml0KCk7CisKKyAgICBpZiAobV9vYnNl cnZlcldyYXBwZXIpCisgICAgICAgIG1fb2JzZXJ2ZXJXcmFwcGVyLT5vYnNlcnZlcigpLmVuZFJ1 bGVCb2R5KG1fb2JzZXJ2ZXJXcmFwcGVyLT5lbmRPZmZzZXQoYmxvY2spKTsKKworICAgIHJldHVy biBTdHlsZVJ1bGVDb250YWluZXI6OmNyZWF0ZSh7IH0sIFdURk1vdmUocnVsZXMpKTsKIH0KLSov CiAgICAgCiBSZWZQdHI8U3R5bGVSdWxlS2V5ZnJhbWU+IENTU1BhcnNlckltcGw6OmNvbnN1bWVL ZXlmcmFtZVN0eWxlUnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUsIENTU1BhcnNlclRv a2VuUmFuZ2UgYmxvY2spCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2Vy L0NTU1BhcnNlckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1w bC5oCmluZGV4IGQ4Y2Y3Yjg1MDEzN2M0NWYzYTQ2OWVmMzNiOTNhMWJjMWEwZGJkYzIuLjBkMjcz ZjU5ZDAyNmJlYTA4MmNkODU5MjJmNDllNGY5YjJjMWU4MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5oCkBAIC0xNDAsOSArMTQwLDcgQEAgcHJpdmF0ZToKICAg ICBSZWZQdHI8U3R5bGVSdWxlUGFnZT4gY29uc3VtZVBhZ2VSdWxlKENTU1BhcnNlclRva2VuUmFu Z2UgcHJlbHVkZSwgQ1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jayk7CiAgICAgUmVmUHRyPFN0eWxl UnVsZUNvdW50ZXJTdHlsZT4gY29uc3VtZUNvdW50ZXJTdHlsZVJ1bGUoQ1NTUGFyc2VyVG9rZW5S YW5nZSBwcmVsdWRlLCBDU1NQYXJzZXJUb2tlblJhbmdlIGJsb2NrKTsKICAgICBSZWZQdHI8U3R5 bGVSdWxlTGF5ZXI+IGNvbnN1bWVMYXllclJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRl LCBzdGQ6Om9wdGlvbmFsPENTU1BhcnNlclRva2VuUmFuZ2U+IGJsb2NrKTsKLQotICAgIC8vIEZJ WE1FLU5FV1BBUlNFUjogU3VwcG9ydCAiYXBwbHkiCi0gICAgLy8gdm9pZCBjb25zdW1lQXBwbHlS dWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVkZSk7CisgICAgUmVmUHRyPFN0eWxlUnVsZUNv bnRhaW5lcj4gY29uc3VtZUNvbnRhaW5lclJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRl LCBDU1NQYXJzZXJUb2tlblJhbmdlIGJsb2NrKTsKIAogICAgIFJlZlB0cjxTdHlsZVJ1bGVLZXlm cmFtZT4gY29uc3VtZUtleWZyYW1lU3R5bGVSdWxlKENTU1BhcnNlclRva2VuUmFuZ2UgcHJlbHVk ZSwgQ1NTUGFyc2VyVG9rZW5SYW5nZSBibG9jayk7CiAgICAgUmVmUHRyPFN0eWxlUnVsZT4gY29u c3VtZVN0eWxlUnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUsIENTU1BhcnNlclRva2Vu UmFuZ2UgYmxvY2spOwo=