233323 2021-11-18 11:25:20 -0800 Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier() 2021-11-18 13:54:27 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233288 1 cdumez cdumez achristensen darin eric.carlson esprehn+autocc ews-watchlist ggaren glenn hi hta jer.noble jiewen_tan joepeck kangil.han pangle philipj sam sergio tommyw webkit-bug-importer youennf oldest_to_newest 1816524 0 cdumez 2021-11-18 11:25:20 -0800 Port call sites to ScriptExecutionContext::identifier() and drop ScriptExecutionContext::contextIdentifier() alias. 1816525 1 444706 cdumez 2021-11-18 11:26:48 -0800 Created attachment 444706 Patch 1816532 2 444707 cdumez 2021-11-18 11:41:37 -0800 Created attachment 444707 Patch 1816581 3 444707 ggaren 2021-11-18 13:00:28 -0800 Comment on attachment 444707 Patch r=me 1816601 4 ews-feeder 2021-11-18 13:28:24 -0800 Committed r286025 (244414@main): <https://commits.webkit.org/244414@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444707. 1816603 5 webkit-bug-importer 2021-11-18 13:29:23 -0800 <rdar://problem/85565579> 444706 2021-11-18 11:26:48 -0800 2021-11-18 11:51:28 -0800 Patch bug-233323-20211118112647.patch text/plain 22933 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZiOWQ1MWVlNGRlYjRj NGM2YjI1MDU1YWU0MmE1M2VjYTBiNGNmOS4uM2FiNzM1NTUxOTk3YWIyNDYxZDlkNmVlODliNzNm MzEzMzM2MjdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDIxLTExLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBjYWxsIHNpdGVzIHRv IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmlkZW50aWZpZXIoKSBhbmQgZHJvcCBTY3JpcHRFeGVj dXRpb25Db250ZXh0Ojpjb250ZXh0SWRlbnRpZmllcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzMjMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQb3J0IGNhbGwgc2l0ZXMgdG8gU2NyaXB0RXhlY3V0 aW9uQ29udGV4dDo6aWRlbnRpZmllcigpIGFuZCBkcm9wIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6 OmNvbnRleHRJZGVudGlmaWVyKCkgYWxpYXMuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY2Fw YWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q2FwYWJpbGl0aWVzOjpkZWNvZGluZ0luZm8pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDYXBh YmlsaXRpZXM6OmVuY29kaW5nSW5mbyk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENEYXRhQ2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbDo6Y3Jl YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fY29udGV4dElkZW50aWZpZXIpOgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0ZyYW1lVHJhbnNmb3JtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6aW5pdGlhbGl6ZVRyYW5zZm9ybWVyKToK KyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6Y3JlYXRlU3RyZWFtcyk6 CisgICAgICAgICogY3J5cHRvL0NyeXB0b0FsZ29yaXRobS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpkaXNwYXRjaEFsZ29yaXRobU9wZXJhdGlvbik6CisgICAgICAgICogY3J5cHRvL2FsZ29yaXRo bXMvQ3J5cHRvQWxnb3JpdGhtRUNESC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdv cml0aG1FQ0RIOjpkZXJpdmVCaXRzKToKKyAgICAgICAgKiBjcnlwdG8vYWxnb3JpdGhtcy9Dcnlw dG9BbGdvcml0aG1TSEExLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNI QTE6OmRpZ2VzdCk6CisgICAgICAgICogY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGht U0hBMjI0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNIQTIyNDo6ZGln ZXN0KToKKyAgICAgICAgKiBjcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEEyNTYu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3J5cHRvQWxnb3JpdGhtU0hBMjU2OjpkaWdlc3QpOgor ICAgICAgICAqIGNyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTM4NC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdvcml0aG1TSEEzODQ6OmRpZ2VzdCk6CisgICAgICAg ICogY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBNTEyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNIQTUxMjo6ZGlnZXN0KToKKyAgICAgICAgKiBjcnlw dG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlS U0E6OmdlbmVyYXRlUGFpcik6CisgICAgICAgICogZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QnJvYWRjYXN0Q2hhbm5lbDo6TWFpblRocmVhZEJyaWRnZTo6cmVn aXN0ZXJDaGFubmVsKToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpTY3JpcHRFeGVjdXRp b25Db250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnJl bW92ZUZyb21Db250ZXh0c01hcCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25D b250ZXh0Ojp+U2NyaXB0RXhlY3V0aW9uQ29udGV4dCk6CisgICAgICAgICogZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQ6OmlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6Y29udGV4dElkZW50aWZpZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHdv cmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bV9jcmVkZW50 aWFscyk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJHbG9iYWxTY29wZTo6fldvcmtlckdsb2Jh bFNjb3BlKToKKwogMjAyMS0xMS0xOCAgQ2hyaXN0b3BoZXIgUmVpZCAgPGMyOXJlaWRAdXdhdGVy bG9vLmNhPgogCiAgICAgICAgIFtXaW5dIEJ1aWxkIGZpeCBhZnRlciByMjg1OTkxCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJp bGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRpZXMvTWVk aWFDYXBhYmlsaXRpZXMuY3BwCmluZGV4IDU1NjliZjRiZWEzMGZkMWUyOTg0ODc2ODQ0M2UzNTc1 NWIwZWFlNzAuLjViNmY0MGRhZmIxY2UzZDJiNGFhMmM3YzIwMTIwMDEyMGM3Y2M2NGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRpZXMvTWVkaWFDYXBh YmlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRp ZXMvTWVkaWFDYXBhYmlsaXRpZXMuY3BwCkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBNZWRpYUNh cGFiaWxpdGllczo6ZGVjb2RpbmdJbmZvKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQs IE1lZGlhRGVjb2QKICAgICB9CiAKICAgICBtX2RlY29kaW5nVGFza3MuYWRkKCsrbV9uZXh0VGFz a0lkZW50aWZpZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKLSAgICBjb250ZXh0LnBvc3RUYXNrVG9S ZXNwb25zaWJsZURvY3VtZW50KFtjb25maWd1cmF0aW9uID0gV1RGTW92ZShjb25maWd1cmF0aW9u KS5pc29sYXRlZENvcHkoKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmNvbnRleHRJZGVu dGlmaWVyKCksIHdlYWtUaGlzID0gV2Vha1B0ciB7IHRoaXMgfSwgdGFza0lkZW50aWZpZXIgPSBt X25leHRUYXNrSWRlbnRpZmllcl0oYXV0byYgZG9jdW1lbnQpIG11dGFibGUgeworICAgIGNvbnRl eHQucG9zdFRhc2tUb1Jlc3BvbnNpYmxlRG9jdW1lbnQoW2NvbmZpZ3VyYXRpb24gPSBXVEZNb3Zl KGNvbmZpZ3VyYXRpb24pLmlzb2xhdGVkQ29weSgpLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRl eHQuaWRlbnRpZmllcigpLCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyB0aGlzIH0sIHRhc2tJZGVudGlm aWVyID0gbV9uZXh0VGFza0lkZW50aWZpZXJdKGF1dG8mIGRvY3VtZW50KSBtdXRhYmxlIHsKICAg ICAgICAgZ2F0aGVyRGVjb2RpbmdJbmZvKGRvY3VtZW50LCBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24p LCBbY29udGV4dElkZW50aWZpZXIsIHdlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHRhc2tJ ZGVudGlmaWVyXShhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAgIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50aWZpZXIsIFt3ZWFrVGhpcyA9 IFdURk1vdmUod2Vha1RoaXMpLCB0YXNrSWRlbnRpZmllciwgcmVzdWx0ID0gV1RGTW92ZShyZXN1 bHQpLmlzb2xhdGVkQ29weSgpXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYg KCF3ZWFrVGhpcykKQEAgLTMxNCw3ICszMTQsNyBAQCB2b2lkIE1lZGlhQ2FwYWJpbGl0aWVzOjpl bmNvZGluZ0luZm8oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgTWVkaWFFbmNvZAog ICAgIH0KIAogICAgIG1fZW5jb2RpbmdUYXNrcy5hZGQoKyttX25leHRUYXNrSWRlbnRpZmllciwg V1RGTW92ZShjYWxsYmFjaykpOwotICAgIGNvbnRleHQucG9zdFRhc2tUb1Jlc3BvbnNpYmxlRG9j dW1lbnQoW2NvbmZpZ3VyYXRpb24gPSBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pLmlzb2xhdGVkQ29w eSgpLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSwgd2Vh a1RoaXMgPSBXZWFrUHRyIHsgdGhpcyB9LCB0YXNrSWRlbnRpZmllciA9IG1fbmV4dFRhc2tJZGVu dGlmaWVyXShhdXRvJiBkb2N1bWVudCkgbXV0YWJsZSB7CisgICAgY29udGV4dC5wb3N0VGFza1Rv UmVzcG9uc2libGVEb2N1bWVudChbY29uZmlndXJhdGlvbiA9IFdURk1vdmUoY29uZmlndXJhdGlv bikuaXNvbGF0ZWRDb3B5KCksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5pZGVudGlmaWVy KCksIHdlYWtUaGlzID0gV2Vha1B0ciB7IHRoaXMgfSwgdGFza0lkZW50aWZpZXIgPSBtX25leHRU YXNrSWRlbnRpZmllcl0oYXV0byYgZG9jdW1lbnQpIG11dGFibGUgewogICAgICAgICBnYXRoZXJF bmNvZGluZ0luZm8oZG9jdW1lbnQsIFdURk1vdmUoY29uZmlndXJhdGlvbiksIFtjb250ZXh0SWRl bnRpZmllciwgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgdGFza0lkZW50aWZpZXJdKGF1 dG8mJiByZXN1bHQpIG11dGFibGUgewogICAgICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW3dlYWtUaGlzID0gV1RGTW92ZSh3ZWFr VGhpcyksIHRhc2tJZGVudGlmaWVyLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCkuaXNvbGF0ZWRD b3B5KCldKGF1dG8mKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hh bm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFu bmVsLmNwcAppbmRleCAwNjUzOTRmZDA0NDc4YmVmYjRjY2E0ZjYyODVjY2JhNzlmMGRjNjZmLi44 ZjgzMzczZGJjNzRiNTJjNDU1NTMwNmE1MDU2ZDJmZGUwZWFhZTc1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmNwcApAQCAt NzEsNyArNzEsNyBAQCBSZWY8UlRDRGF0YUNoYW5uZWw+IFJUQ0RhdGFDaGFubmVsOjpjcmVhdGUo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgc3RkOgogICAgICAgICBpZiAoIWNoYW5u ZWwtPm1faGFuZGxlcikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKGF1dG8qIGNv bnRleHQgPSBjaGFubmVsLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCi0gICAgICAgICAgICBj aGFubmVsLT5tX2hhbmRsZXItPnNldENsaWVudCgqY2hhbm5lbCwgY29udGV4dC0+Y29udGV4dElk ZW50aWZpZXIoKSk7CisgICAgICAgICAgICBjaGFubmVsLT5tX2hhbmRsZXItPnNldENsaWVudCgq Y2hhbm5lbCwgY29udGV4dC0+aWRlbnRpZmllcigpKTsKICAgICB9KTsKICAgICByZXR1cm4gY2hh bm5lbDsKIH0KQEAgLTk3LDcgKzk3LDcgQEAgUlRDRGF0YUNoYW5uZWw6OlJUQ0RhdGFDaGFubmVs KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIHN0ZDo6dW5pcXVlX3B0cjwKICAgICA6 IEFjdGl2ZURPTU9iamVjdCgmY29udGV4dCkKICAgICAsIG1faGFuZGxlcihXVEZNb3ZlKGhhbmRs ZXIpKQogICAgICwgbV9pZGVudGlmaWVyKFJUQ0RhdGFDaGFubmVsSWRlbnRpZmllciB7IFByb2Nl c3M6OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxSVENEYXRhQ2hhbm5lbExvY2FsSWRl bnRpZmllclR5cGU+OjpnZW5lcmF0ZVRocmVhZFNhZmUoKSB9KQotICAgICwgbV9jb250ZXh0SWRl bnRpZmllcihjb250ZXh0LmlzRG9jdW1lbnQoKSA/IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVu dGlmaWVyIHsgfSA6IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSkKKyAgICAsIG1fY29udGV4 dElkZW50aWZpZXIoY29udGV4dC5pc0RvY3VtZW50KCkgPyBTY3JpcHRFeGVjdXRpb25Db250ZXh0 SWRlbnRpZmllciB7IH0gOiBjb250ZXh0LmlkZW50aWZpZXIoKSkKICAgICAsIG1fbGFiZWwoV1RG TW92ZShsYWJlbCkpCiAgICAgLCBtX29wdGlvbnMoV1RGTW92ZShvcHRpb25zKSkKICAgICAsIG1f bWVzc2FnZVF1ZXVlKGNyZWF0ZU1lc3NhZ2VRdWV1ZShjb250ZXh0LCAqdGhpcykpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNGcmFtZVRyYW5z Zm9ybS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNGcmFt ZVRyYW5zZm9ybS5jcHAKaW5kZXggMTI2OGJhNTYxN2VjZmM2MTFkNWZmYTQ1NDc0YjM5NDIxNzE5 MWJmZC4uODM0MjA3MGNhY2JmYzI0MzY5ZWNhMzExZjFkMzg2NDg0YzliYTIyOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTRnJhbWVUcmFuc2Zv cm0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0Zy YW1lVHJhbnNmb3JtLmNwcApAQCAtMTU5LDcgKzE1OSw3IEBAIHZvaWQgUlRDUnRwU0ZyYW1lVHJh bnNmb3JtOjppbml0aWFsaXplVHJhbnNmb3JtZXIoUlRDUnRwVHJhbnNmb3JtQmFja2VuZCYgYmFj a2VuCiAgICAgbV90cmFuc2Zvcm1lci0+c2V0SXNFbmNyeXB0aW5nKHNpZGUgPT0gU2lkZTo6U2Vu ZGVyKTsKICAgICBtX3RyYW5zZm9ybWVyLT5zZXRNZWRpYVR5cGUoYmFja2VuZC5tZWRpYVR5cGUo KSk7CiAKLSAgICBiYWNrZW5kLnNldFRyYW5zZm9ybWFibGVGcmFtZUNhbGxiYWNrKFt0cmFuc2Zv cm1lciA9IG1fdHJhbnNmb3JtZXIsIGlkZW50aWZpZXIgPSBjb250ZXh0LT5jb250ZXh0SWRlbnRp ZmllcigpLCBiYWNrZW5kID0gUmVmIHsgYmFja2VuZCB9LCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyAq dGhpcyB9XShhdXRvJiYgZnJhbWUpIHsKKyAgICBiYWNrZW5kLnNldFRyYW5zZm9ybWFibGVGcmFt ZUNhbGxiYWNrKFt0cmFuc2Zvcm1lciA9IG1fdHJhbnNmb3JtZXIsIGlkZW50aWZpZXIgPSBjb250 ZXh0LT5pZGVudGlmaWVyKCksIGJhY2tlbmQgPSBSZWYgeyBiYWNrZW5kIH0sIHdlYWtUaGlzID0g V2Vha1B0ciB7ICp0aGlzIH1dKGF1dG8mJiBmcmFtZSkgewogICAgICAgICBhdXRvIGNodW5rID0g ZnJhbWUtPmRhdGEoKTsKICAgICAgICAgaWYgKCFjaHVuay5kYXRhKCkgfHwgIWNodW5rLnNpemUo KSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTIzMSwxMyArMjMxLDEzIEBAIEV4Y2VwdGlvbk9y PHZvaWQ+IFJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6Y3JlYXRlU3RyZWFtcygpCiAKICAgICAgICAg Ly8gV2UgZG8gbm90IHdhbnQgdG8gdGhyb3cgYW55IGV4Y2VwdGlvbiBpbiB0aGUgdHJhbnNmb3Jt IHRvIG1ha2Ugc3VyZSB3ZSBkbyBub3QgZXJyb3IgdGhlIHRyYW5zZm9ybS4KICAgICAgICAgV1RG Ojpzd2l0Y2hPbihmcmFtZSwgWyZdKFJlZlB0cjxSVENFbmNvZGVkQXVkaW9GcmFtZT4mIHZhbHVl KSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJh bnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwgY29udGV4dC5jb250ZXh0SWRl bnRpZmllcigpLCB3ZWFrVGhpcyk7CisgICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUs IGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwg Y29udGV4dC5pZGVudGlmaWVyKCksIHdlYWtUaGlzKTsKICAgICAgICAgfSwgWyZdKFJlZlB0cjxS VENFbmNvZGVkVmlkZW9GcmFtZT4mIHZhbHVlKSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFt ZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVh bVNvdXJjZSwgY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpLCB3ZWFrVGhpcyk7CisgICAgICAg ICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0 KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwgY29udGV4dC5pZGVudGlmaWVyKCksIHdlYWtUaGlz KTsKICAgICAgICAgfSwgWyZdKFJlZlB0cjxBcnJheUJ1ZmZlcj4mIHZhbHVlKSB7Ci0gICAgICAg ICAgICB0cmFuc2Zvcm1GcmFtZSh7IHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QqPih2YWx1ZS0+ ZGF0YSgpKSwgdmFsdWUtPmJ5dGVMZW5ndGgoKSB9LCBnbG9iYWxPYmplY3QsIHRyYW5zZm9ybWVy LmdldCgpLCAqcmVhZGFibGVTdHJlYW1Tb3VyY2UsIGNvbnRleHQuY29udGV4dElkZW50aWZpZXIo KSwgd2Vha1RoaXMpOworICAgICAgICAgICAgdHJhbnNmb3JtRnJhbWUoeyBzdGF0aWNfY2FzdDxj b25zdCB1aW50OF90Kj4odmFsdWUtPmRhdGEoKSksIHZhbHVlLT5ieXRlTGVuZ3RoKCkgfSwgZ2xv YmFsT2JqZWN0LCB0cmFuc2Zvcm1lci5nZXQoKSwgKnJlYWRhYmxlU3RyZWFtU291cmNlLCBjb250 ZXh0LmlkZW50aWZpZXIoKSwgd2Vha1RoaXMpOwogICAgICAgICB9LCBbJl0oUmVmUHRyPEFycmF5 QnVmZmVyVmlldz4mIHZhbHVlKSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSh7IHN0YXRp Y19jYXN0PGNvbnN0IHVpbnQ4X3QqPih2YWx1ZS0+ZGF0YSgpKSwgdmFsdWUtPmJ5dGVMZW5ndGgo KSB9LCBnbG9iYWxPYmplY3QsIHRyYW5zZm9ybWVyLmdldCgpLCAqcmVhZGFibGVTdHJlYW1Tb3Vy Y2UsIGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSwgd2Vha1RoaXMpOworICAgICAgICAgICAg dHJhbnNmb3JtRnJhbWUoeyBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4odmFsdWUtPmRhdGEo KSksIHZhbHVlLT5ieXRlTGVuZ3RoKCkgfSwgZ2xvYmFsT2JqZWN0LCB0cmFuc2Zvcm1lci5nZXQo KSwgKnJlYWRhYmxlU3RyZWFtU291cmNlLCBjb250ZXh0LmlkZW50aWZpZXIoKSwgd2Vha1RoaXMp OwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9KSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0uY3BwCmluZGV4IDQ4MWJiZjFjOWY2ZTc4ZWE0YmIy ZDczMTY1MjAzOTM4NGU2YTA3MWMuLmZmOTg2NDY2MzhjZmMyNmI1ZDU1Y2M2ZTE1ZTUxZTA5N2U2 OTZjYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0uY3BwCkBAIC05 Niw3ICs5Niw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFJlc3VsdENhbGxiYWNrVHlwZSwgdHlwZW5h bWUgT3BlcmF0aW9uVHlwZT4KIHN0YXRpYyB2b2lkIGRpc3BhdGNoQWxnb3JpdGhtT3BlcmF0aW9u KFdvcmtRdWV1ZSYgd29ya1F1ZXVlLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBS ZXN1bHRDYWxsYmFja1R5cGUmJiBjYWxsYmFjaywgQ3J5cHRvQWxnb3JpdGhtOjpFeGNlcHRpb25D YWxsYmFjayYmIGV4Y2VwdGlvbkNhbGxiYWNrLCBPcGVyYXRpb25UeXBlJiYgb3BlcmF0aW9uKQog ewogICAgIHdvcmtRdWV1ZS5kaXNwYXRjaCgKLSAgICAgICAgW29wZXJhdGlvbiA9IFdURk1vdmUo b3BlcmF0aW9uKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZXhjZXB0aW9uQ2FsbGJh Y2sgPSBXVEZNb3ZlKGV4Y2VwdGlvbkNhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250 ZXh0LmNvbnRleHRJZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CisgICAgICAgIFtvcGVyYXRpb24g PSBXVEZNb3ZlKG9wZXJhdGlvbiksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGV4Y2Vw dGlvbkNhbGxiYWNrID0gV1RGTW92ZShleGNlcHRpb25DYWxsYmFjayksIGNvbnRleHRJZGVudGlm aWVyID0gY29udGV4dC5pZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRv IHJlc3VsdCA9IG9wZXJhdGlvbigpOwogICAgICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW3Jlc3VsdCA9IGNyb3NzVGhyZWFkQ29w eShyZXN1bHQpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBleGNlcHRpb25DYWxsYmFj ayA9IFdURk1vdmUoZXhjZXB0aW9uQ2FsbGJhY2spXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAg ICAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtRUNESC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcAppbmRl eCA3NzZkMzliYTNiZWIzZTk1MmNkZmQ3YjVlZDM5ZGVkMWE2OWNlN2Q5Li44ZGY0OTM4ZGM5ZjU0 NjI3MzA0ODhhY2EzMDMzNTk3ZDY0ZDEwYmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j cnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcApAQCAtMTExLDcg KzExMSw3IEBAIHZvaWQgQ3J5cHRvQWxnb3JpdGhtRUNESDo6ZGVyaXZlQml0cyhjb25zdCBDcnlw dG9BbGdvcml0aG1QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzCiAgICAgLy8gVGhpcyBpcyBhIHNwZWNp YWwgY2FzZSB0aGF0IGNhbid0IHVzZSBkaXNwYXRjaE9wZXJhdGlvbigpIGJlY2F1c2UgaXQgYnVu ZGxlcwogICAgIC8vIHRoZSByZXN1bHQgdmFsaWRhdGlvbiBhbmQgY2FsbGJhY2sgZGlzcGF0Y2gg aW50byB1bmlmaWVkQ2FsbGJhY2suCiAgICAgd29ya1F1ZXVlLmRpc3BhdGNoKAotICAgICAgICBb YmFzZUtleSA9IFdURk1vdmUoYmFzZUtleSksIHB1YmxpY0tleSA9IGVjUGFyYW1ldGVycy5wdWJs aWNLZXksIGxlbmd0aCwgdW5pZmllZENhbGxiYWNrID0gV1RGTW92ZSh1bmlmaWVkQ2FsbGJhY2sp LCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKV0oKSBtdXRh YmxlIHsKKyAgICAgICAgW2Jhc2VLZXkgPSBXVEZNb3ZlKGJhc2VLZXkpLCBwdWJsaWNLZXkgPSBl Y1BhcmFtZXRlcnMucHVibGljS2V5LCBsZW5ndGgsIHVuaWZpZWRDYWxsYmFjayA9IFdURk1vdmUo dW5pZmllZENhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIo KV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGF1dG8gZGVyaXZlZEtleSA9IHBsYXRmb3JtRGVy aXZlQml0cyhkb3duY2FzdDxDcnlwdG9LZXlFQz4oYmFzZUtleS5nZXQoKSksIGRvd25jYXN0PENy eXB0b0tleUVDPigqcHVibGljS2V5KSk7CiAgICAgICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250 ZXh0Ojpwb3N0VGFza1RvKGNvbnRleHRJZGVudGlmaWVyLCBbZGVyaXZlZEtleSA9IFdURk1vdmUo ZGVyaXZlZEtleSksIGxlbmd0aCwgdW5pZmllZENhbGxiYWNrID0gV1RGTW92ZSh1bmlmaWVkQ2Fs bGJhY2spXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgdW5pZmllZENhbGxiYWNr KFdURk1vdmUoZGVyaXZlZEtleSksIGxlbmd0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEExLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCmluZGV4IDJmN2Yy NWJiMjU1MGE3MjU1Mzg1NDc0MzU2YWE2Nzg4YmRiZDI0OWMuLjE0ZGNhNjM5YmExYjUxMjgyOGZh N2QwZTEyNzBmNDQ4NDM1ODdhYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9h bGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Ny eXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCkBAIC01MSw3ICs1MSw3IEBA IHZvaWQgQ3J5cHRvQWxnb3JpdGhtU0hBMTo6ZGlnZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3Nh Z2UsIFZlY3RvckNhbGxiYWNrJiYgY2FsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICB3 b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdU Rk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNvbnRleHRJZGVu dGlmaWVyID0gY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpXSgpIG11dGFibGUgeworICAgIHdv cmtRdWV1ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdlc3QpLCBtZXNzYWdlID0gV1RG TW92ZShtZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgY29udGV4dElkZW50 aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIoKV0oKSBtdXRhYmxlIHsKICAgICAgICAgZGlnZXN0 LT5hZGRCeXRlcyhtZXNzYWdlLmRhdGEoKSwgbWVzc2FnZS5zaXplKCkpOwogICAgICAgICBhdXRv IHJlc3VsdCA9IGRpZ2VzdC0+Y29tcHV0ZUhhc2goKTsKICAgICAgICAgU2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW2NhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0oYXV0byYpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTIy NC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1T SEEyMjQuY3BwCmluZGV4IDZlMTgxMGM5NGY5YmE2MjFmOTg4YWI5MzI3M2Q3NjUxZjk3NjdlMGQu LjVhZTgyYzQzYjY1OGZkYzNmYTA1MmFkMTUyNDI1Yzg3MTA5NWYwY2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTIyNC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hB MjI0LmNwcApAQCAtNTEsNyArNTEsNyBAQCB2b2lkIENyeXB0b0FsZ29yaXRobVNIQTIyNDo6ZGln ZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3NhZ2UsIFZlY3RvckNhbGxiYWNrJiYgYwogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgd29ya1F1ZXVlLmRpc3BhdGNoKFtkaWdlc3QgPSBXVEZN b3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2UpLCBjYWxsYmFjayA9IFdURk1v dmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZp ZXIoKV0oKSBtdXRhYmxlIHsKKyAgICB3b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1v dmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5pZGVudGlmaWVyKCldKCkg bXV0YWJsZSB7CiAgICAgICAgIGRpZ2VzdC0+YWRkQnl0ZXMobWVzc2FnZS5kYXRhKCksIG1lc3Nh Z2Uuc2l6ZSgpKTsKICAgICAgICAgYXV0byByZXN1bHQgPSBkaWdlc3QtPmNvbXB1dGVIYXNoKCk7 CiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50 aWZpZXIsIFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCByZXN1bHQgPSBXVEZNb3ZlKHJl c3VsdCldKGF1dG8mKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3Jp dGhtcy9DcnlwdG9BbGdvcml0aG1TSEEyNTYuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2Fs Z29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMjU2LmNwcAppbmRleCA4Njk0MzI1MmMyN2UwNWFi Y2E1NDgyNzMzMzEwMzMzNzg2YzE0NmNmLi40NjJjMmQ0M2VkMWUzMjUzNzg3ZDc5NmU3NDJjNjQx YjZhZTEzMGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9D cnlwdG9BbGdvcml0aG1TSEEyNTYuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdv cml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTI1Ni5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdm9pZCBD cnlwdG9BbGdvcml0aG1TSEEyNTY6OmRpZ2VzdChWZWN0b3I8dWludDhfdD4mJiBtZXNzYWdlLCBW ZWN0b3JDYWxsYmFjayYmIGMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHdvcmtRdWV1 ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdlc3QpLCBtZXNzYWdlID0gV1RGTW92ZSht ZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIg PSBjb250ZXh0LmNvbnRleHRJZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CisgICAgd29ya1F1ZXVl LmRpc3BhdGNoKFtkaWdlc3QgPSBXVEZNb3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1l c3NhZ2UpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9 IGNvbnRleHQuaWRlbnRpZmllcigpXSgpIG11dGFibGUgewogICAgICAgICBkaWdlc3QtPmFkZEJ5 dGVzKG1lc3NhZ2UuZGF0YSgpLCBtZXNzYWdlLnNpemUoKSk7CiAgICAgICAgIGF1dG8gcmVzdWx0 ID0gZGlnZXN0LT5jb21wdXRlSGFzaCgpOwogICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0 Ojpwb3N0VGFza1RvKGNvbnRleHRJZGVudGlmaWVyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKSwgcmVzdWx0ID0gV1RGTW92ZShyZXN1bHQpXShhdXRvJikgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMzg0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTM4NC5j cHAKaW5kZXggODQwZGZhZTI2MWFiNzU5MTM1NjBlOTQ0ZTNmZDg3MDFjNTBlNGUzNi4uYmJlZGE1 ZWI4NmQ4N2RiNzEwNDc0ODJkMDg5ZTBlYTg4MmI1MjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMzg0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEEzODQuY3Bw CkBAIC01MSw3ICs1MSw3IEBAIHZvaWQgQ3J5cHRvQWxnb3JpdGhtU0hBMzg0OjpkaWdlc3QoVmVj dG9yPHVpbnQ4X3Q+JiYgbWVzc2FnZSwgVmVjdG9yQ2FsbGJhY2smJiBjCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICB3b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGln ZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxs YmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpXSgp IG11dGFibGUgeworICAgIHdvcmtRdWV1ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdl c3QpLCBtZXNzYWdlID0gV1RGTW92ZShtZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIoKV0oKSBtdXRhYmxl IHsKICAgICAgICAgZGlnZXN0LT5hZGRCeXRlcyhtZXNzYWdlLmRhdGEoKSwgbWVzc2FnZS5zaXpl KCkpOwogICAgICAgICBhdXRvIHJlc3VsdCA9IGRpZ2VzdC0+Y29tcHV0ZUhhc2goKTsKICAgICAg ICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwg W2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0o YXV0byYpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0Ny eXB0b0FsZ29yaXRobVNIQTUxMi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGht cy9DcnlwdG9BbGdvcml0aG1TSEE1MTIuY3BwCmluZGV4IDkzODhjNWY4M2MzYWJhOTQyYmVlZTg2 MGM4Mzk5ODAxNWM0N2JkODUuLjBjYjIzYjhmZGJiM2ViMmFmMDZkZWQzN2YyZGUxY2NjZDI1ZTZi YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0Fs Z29yaXRobVNIQTUxMi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMv Q3J5cHRvQWxnb3JpdGhtU0hBNTEyLmNwcApAQCAtNTEsNyArNTEsNyBAQCB2b2lkIENyeXB0b0Fs Z29yaXRobVNIQTUxMjo6ZGlnZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3NhZ2UsIFZlY3RvckNh bGxiYWNrJiYgYwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgd29ya1F1ZXVlLmRpc3Bh dGNoKFtkaWdlc3QgPSBXVEZNb3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2Up LCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRl eHQuY29udGV4dElkZW50aWZpZXIoKV0oKSBtdXRhYmxlIHsKKyAgICB3b3JrUXVldWUuZGlzcGF0 Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSks IGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4 dC5pZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CiAgICAgICAgIGRpZ2VzdC0+YWRkQnl0ZXMobWVz c2FnZS5kYXRhKCksIG1lc3NhZ2Uuc2l6ZSgpKTsKICAgICAgICAgYXV0byByZXN1bHQgPSBkaWdl c3QtPmNvbXB1dGVIYXNoKCk7CiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnBvc3RU YXNrVG8oY29udGV4dElkZW50aWZpZXIsIFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBy ZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCldKGF1dG8mKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jcnlwdG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlw dG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAKaW5kZXggOTE2NmNhNTUwODY2ZDM5MjNiMWVlZDc2 Nzc5ZGIxNThlYzBhNDkyMS4uYjkyYmRkYjRiMzMwNmI3NWY1ODFmMjU0M2ZmZDE4ZTkxMDM2N2E0 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9LZXlSU0FNYWMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFjLmNwcApA QCAtMjc3LDcgKzI3Nyw3IEBAIHZvaWQgQ3J5cHRvS2V5UlNBOjpnZW5lcmF0ZVBhaXIoQ3J5cHRv QWxnb3JpdGhtSWRlbnRpZmllciBhbGdvcml0aG0sIENyeXB0b0FsZ29yCiAKICAgICBfX2Jsb2Nr IGF1dG8gYmxvY2tDYWxsYmFjayhXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgX19ibG9jayBhdXRv IGJsb2NrRmFpbHVyZUNhbGxiYWNrKFdURk1vdmUoZmFpbHVyZUNhbGxiYWNrKSk7Ci0gICAgYXV0 byBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQtPmNvbnRleHRJZGVudGlmaWVyKCk7CisgICAg YXV0byBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQtPmlkZW50aWZpZXIoKTsKICAgICBkaXNw YXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9S SVRZX0RFRkFVTFQsIDApLCBeewogICAgICAgICBDQ1JTQUNyeXB0b3JSZWYgY2NQdWJsaWNLZXkg PSBudWxscHRyOwogICAgICAgICBDQ1JTQUNyeXB0b3JSZWYgY2NQcml2YXRlS2V5ID0gbnVsbHB0 cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ccm9hZGNhc3RDaGFubmVsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ccm9hZGNhc3RDaGFubmVsLmNwcAppbmRleCA3MTJlMjhhNWIz ZGY1YjEwNTNmYzk5OWU2NTZhM2U1YmIwNzI4YTI1Li43NGFjZTNlYTljZWU4MzY2MjdkMzkzZDBj Y2U5MzU5YTFjZDM0ZDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQnJvYWRjYXN0 Q2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3Bw CkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBCcm9hZGNhc3RDaGFubmVsOjpNYWluVGhyZWFkQnJp ZGdlOjplbnN1cmVPbk1haW5UaHJlYWQoRnVuY3Rpb248dm9pZChEb2N1bWUKIAogdm9pZCBCcm9h ZGNhc3RDaGFubmVsOjpNYWluVGhyZWFkQnJpZGdlOjpyZWdpc3RlckNoYW5uZWwoKQogewotICAg IGVuc3VyZU9uTWFpblRocmVhZChbdGhpcywgY29udGV4dElkZW50aWZpZXIgPSBtX2Jyb2FkY2Fz dENoYW5uZWwtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+Y29udGV4dElkZW50aWZpZXIoKV0o YXV0byYgZG9jdW1lbnQpIHsKKyAgICBlbnN1cmVPbk1haW5UaHJlYWQoW3RoaXMsIGNvbnRleHRJ ZGVudGlmaWVyID0gbV9icm9hZGNhc3RDaGFubmVsLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkt PmlkZW50aWZpZXIoKV0oYXV0byYgZG9jdW1lbnQpIHsKICAgICAgICAgbV9vcmlnaW4gPSB7IHNo b3VsZFBhcnRpdGlvbk9yaWdpbihkb2N1bWVudCkgPyBkb2N1bWVudC50b3BPcmlnaW4oKS5kYXRh KCkgOiBkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSwgZG9jdW1lbnQuc2VjdXJpdHlP cmlnaW4oKS5kYXRhKCkgfTsKICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBkb2N1bWVudC5wYWdl KCkpCiAgICAgICAgICAgICBwYWdlLT5icm9hZGNhc3RDaGFubmVsUmVnaXN0cnkoKS5yZWdpc3Rl ckNoYW5uZWwobV9vcmlnaW4sIG1fbmFtZSwgbV9pZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAppbmRleCA5ZDk2NWFmMGNhNzg3YjRj ZjA2YmQxODY3YTQwOTYxYWUzMDAxY2Q2Li5hNTZlMzBkMjQ4NzA3MzA2NDJiMzI3NTUyMThjNWEy NTYwYTRkNjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9u Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQuY3BwCkBAIC0xMTQsMTcgKzExNCwxNyBAQCBwdWJsaWM6CiB9OwogCiBTY3JpcHRFeGVjdXRp b25Db250ZXh0OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KCkKLSAgICA6IG1fY29udGV4dElkZW50 aWZpZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI6OmdlbmVyYXRlVGhyZWFkU2Fm ZSgpKQorICAgIDogbV9pZGVudGlmaWVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVy OjpnZW5lcmF0ZVRocmVhZFNhZmUoKSkKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgYWxsU2NyaXB0 RXhlY3V0aW9uQ29udGV4dHNNYXBMb2NrIH07Ci0gICAgYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4 dHNNYXAoKS5hZGQobV9jb250ZXh0SWRlbnRpZmllciwgdGhpcyk7CisgICAgYWxsU2NyaXB0RXhl Y3V0aW9uQ29udGV4dHNNYXAoKS5hZGQobV9pZGVudGlmaWVyLCB0aGlzKTsKIH0KIAogdm9pZCBT Y3JpcHRFeGVjdXRpb25Db250ZXh0OjpyZW1vdmVGcm9tQ29udGV4dHNNYXAoKQogewogICAgIExv Y2tlciBsb2NrZXIgeyBhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcExvY2sgfTsKLSAgICBB U1NFUlQoYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4dHNNYXAoKS5jb250YWlucyhtX2NvbnRleHRJ ZGVudGlmaWVyKSk7Ci0gICAgYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4dHNNYXAoKS5yZW1vdmUo bV9jb250ZXh0SWRlbnRpZmllcik7CisgICAgQVNTRVJUKGFsbFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRzTWFwKCkuY29udGFpbnMobV9pZGVudGlmaWVyKSk7CisgICAgYWxsU2NyaXB0RXhlY3V0aW9u Q29udGV4dHNNYXAoKS5yZW1vdmUobV9pZGVudGlmaWVyKTsKIH0KIAogI2lmICFBU1NFUlRfRU5B QkxFRApAQCAtMTU4LDcgKzE1OCw3IEBAIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6On5TY3JpcHRF eGVjdXRpb25Db250ZXh0KCkKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIHsKICAgICAgICAgTG9j a2VyIGxvY2tlciB7IGFsbFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRzTWFwTG9jayB9OwotICAgICAg ICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcCgpLmNv bnRhaW5zKG1fY29udGV4dElkZW50aWZpZXIpLCAiQSBTY3JpcHRFeGVjdXRpb25Db250ZXh0IHN1 YmNsYXNzIGluc3RhbmNlIGltcGxlbWVudGluZyBwb3N0VGFzayBzaG91bGQgaGF2ZSBhbHJlYWR5 IHJlbW92ZWQgaXRzZWxmIGZyb20gdGhlIG1hcCIpOworICAgICAgICBBU1NFUlRfV0lUSF9NRVNT QUdFKCFhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcCgpLmNvbnRhaW5zKG1faWRlbnRpZmll ciksICJBIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgc3ViY2xhc3MgaW5zdGFuY2UgaW1wbGVtZW50 aW5nIHBvc3RUYXNrIHNob3VsZCBoYXZlIGFscmVhZHkgcmVtb3ZlZCBpdHNlbGYgZnJvbSB0aGUg bWFwIik7CiAgICAgfQogCiAgICAgbV9pblNjcmlwdEV4ZWN1dGlvbkNvbnRleHREZXN0cnVjdG9y ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25D b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCmlu ZGV4IDY1NzRjMzNmNzFlNDY3NWM5MTZhOTA2MjEzMWM0OTI1YjFhMjM0ZmMuLmFmM2IxMWM4YzM5 NTQ2N2VhZGEwNzc1OGU2NGZkMmFhNjQ1ZDQ2MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQuaApAQCAtMjgzLDkgKzI4Myw3IEBAIHB1YmxpYzoKICAgICBX RUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBwb3N0VGFza1RvKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRJZGVudGlmaWVyLCBUYXNrJiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGVu c3VyZU9uQ29udGV4dFRocmVhZChTY3JpcHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciwgVGFz ayYmKTsKIAotICAgIC8vIEZJWE1FOiBQb3J0IGNhbGwgc2l0ZXMgdG8gaWRlbnRpZmllcigpIGFu ZCBkcm9wIHRoaXMgZnVuY3Rpb24uCi0gICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZp ZXIgY29udGV4dElkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHRJZGVudGlmaWVy OyB9Ci0gICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgaWRlbnRpZmllcigpIGNv bnN0IHsgcmV0dXJuIG1fY29udGV4dElkZW50aWZpZXI7IH0KKyAgICBTY3JpcHRFeGVjdXRpb25D b250ZXh0SWRlbnRpZmllciBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVy OyB9CiAKIHByb3RlY3RlZDoKICAgICBjbGFzcyBBZGRDb25zb2xlTWVzc2FnZVRhc2sgOiBwdWJs aWMgVGFzayB7CkBAIC0zNjMsNyArMzYxLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgU3Ry aW5nIG1fZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb247Ci0gICAgbXV0YWJsZSBTY3JpcHRFeGVjdXRp b25Db250ZXh0SWRlbnRpZmllciBtX2NvbnRleHRJZGVudGlmaWVyOworICAgIG11dGFibGUgU2Ny aXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgbV9pZGVudGlmaWVyOwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3Jr ZXJHbG9iYWxTY29wZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNj b3BlLmNwcAppbmRleCBlODMyMjgxNWQ5NGUxNDk3MmVlZmU0YWE3M2ZmNDgxMWViZDNmOWI5Li5j NjNhN2Q4ZDdmMDAwZGMxMzlhODU5M2QyYTUwYTIxN2I3NDZkOGI0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcApAQCAtMTAzLDcgKzEwMyw3IEBAIFdv cmtlckdsb2JhbFNjb3BlOjpXb3JrZXJHbG9iYWxTY29wZShXb3JrZXJUaHJlYWRUeXBlIHR5cGUs IGNvbnN0IFdvcmtlclBhcmFtZXRlCiB7CiAgICAgewogICAgICAgICBMb2NrZXIgbG9ja2VyIHsg YWxsV29ya2VyR2xvYmFsU2NvcGVJZGVudGlmaWVyc0xvY2sgfTsKLSAgICAgICAgYWxsV29ya2Vy R2xvYmFsU2NvcGVJZGVudGlmaWVycygpLmFkZChjb250ZXh0SWRlbnRpZmllcigpKTsKKyAgICAg ICAgYWxsV29ya2VyR2xvYmFsU2NvcGVJZGVudGlmaWVycygpLmFkZChpZGVudGlmaWVyKCkpOwog ICAgIH0KIAogICAgIGlmIChtX3RvcE9yaWdpbi0+aGFzVW5pdmVyc2FsQWNjZXNzKCkpCkBAIC0x MjQsNyArMTI0LDcgQEAgV29ya2VyR2xvYmFsU2NvcGU6On5Xb3JrZXJHbG9iYWxTY29wZSgpCiAK ICAgICB7CiAgICAgICAgIExvY2tlciBsb2NrZXIgeyBhbGxXb3JrZXJHbG9iYWxTY29wZUlkZW50 aWZpZXJzTG9jayB9OwotICAgICAgICBhbGxXb3JrZXJHbG9iYWxTY29wZUlkZW50aWZpZXJzKCku cmVtb3ZlKGNvbnRleHRJZGVudGlmaWVyKCkpOworICAgICAgICBhbGxXb3JrZXJHbG9iYWxTY29w ZUlkZW50aWZpZXJzKCkucmVtb3ZlKGlkZW50aWZpZXIoKSk7CiAgICAgfQogCiAgICAgbV9wZXJm b3JtYW5jZSA9IG51bGxwdHI7Cg== 444707 2021-11-18 11:41:37 -0800 2021-11-18 13:54:27 -0800 Patch bug-233323-20211118114136.patch text/plain 31170 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZiOWQ1MWVlNGRlYjRj NGM2YjI1MDU1YWU0MmE1M2VjYTBiNGNmOS4uM2FiNzM1NTUxOTk3YWIyNDYxZDlkNmVlODliNzNm MzEzMzM2MjdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDIxLTExLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBjYWxsIHNpdGVzIHRv IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmlkZW50aWZpZXIoKSBhbmQgZHJvcCBTY3JpcHRFeGVj dXRpb25Db250ZXh0Ojpjb250ZXh0SWRlbnRpZmllcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzMjMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQb3J0IGNhbGwgc2l0ZXMgdG8gU2NyaXB0RXhlY3V0 aW9uQ29udGV4dDo6aWRlbnRpZmllcigpIGFuZCBkcm9wIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6 OmNvbnRleHRJZGVudGlmaWVyKCkgYWxpYXMuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY2Fw YWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q2FwYWJpbGl0aWVzOjpkZWNvZGluZ0luZm8pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDYXBh YmlsaXRpZXM6OmVuY29kaW5nSW5mbyk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENEYXRhQ2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbDo6Y3Jl YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Om1fY29udGV4dElkZW50aWZpZXIpOgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0ZyYW1lVHJhbnNmb3JtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6aW5pdGlhbGl6ZVRyYW5zZm9ybWVyKToK KyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6Y3JlYXRlU3RyZWFtcyk6 CisgICAgICAgICogY3J5cHRvL0NyeXB0b0FsZ29yaXRobS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpkaXNwYXRjaEFsZ29yaXRobU9wZXJhdGlvbik6CisgICAgICAgICogY3J5cHRvL2FsZ29yaXRo bXMvQ3J5cHRvQWxnb3JpdGhtRUNESC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdv cml0aG1FQ0RIOjpkZXJpdmVCaXRzKToKKyAgICAgICAgKiBjcnlwdG8vYWxnb3JpdGhtcy9Dcnlw dG9BbGdvcml0aG1TSEExLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNI QTE6OmRpZ2VzdCk6CisgICAgICAgICogY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGht U0hBMjI0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNIQTIyNDo6ZGln ZXN0KToKKyAgICAgICAgKiBjcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEEyNTYu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3J5cHRvQWxnb3JpdGhtU0hBMjU2OjpkaWdlc3QpOgor ICAgICAgICAqIGNyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTM4NC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdvcml0aG1TSEEzODQ6OmRpZ2VzdCk6CisgICAgICAg ICogY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBNTEyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVNIQTUxMjo6ZGlnZXN0KToKKyAgICAgICAgKiBjcnlw dG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9LZXlS U0E6OmdlbmVyYXRlUGFpcik6CisgICAgICAgICogZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QnJvYWRjYXN0Q2hhbm5lbDo6TWFpblRocmVhZEJyaWRnZTo6cmVn aXN0ZXJDaGFubmVsKToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpTY3JpcHRFeGVjdXRp b25Db250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnJl bW92ZUZyb21Db250ZXh0c01hcCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25D b250ZXh0Ojp+U2NyaXB0RXhlY3V0aW9uQ29udGV4dCk6CisgICAgICAgICogZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQ6OmlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6Y29udGV4dElkZW50aWZpZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHdv cmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bV9jcmVkZW50 aWFscyk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJHbG9iYWxTY29wZTo6fldvcmtlckdsb2Jh bFNjb3BlKToKKwogMjAyMS0xMS0xOCAgQ2hyaXN0b3BoZXIgUmVpZCAgPGMyOXJlaWRAdXdhdGVy bG9vLmNhPgogCiAgICAgICAgIFtXaW5dIEJ1aWxkIGZpeCBhZnRlciByMjg1OTkxCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJp bGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRpZXMvTWVk aWFDYXBhYmlsaXRpZXMuY3BwCmluZGV4IDU1NjliZjRiZWEzMGZkMWUyOTg0ODc2ODQ0M2UzNTc1 NWIwZWFlNzAuLjViNmY0MGRhZmIxY2UzZDJiNGFhMmM3YzIwMTIwMDEyMGM3Y2M2NGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRpZXMvTWVkaWFDYXBh YmlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjYXBhYmlsaXRp ZXMvTWVkaWFDYXBhYmlsaXRpZXMuY3BwCkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBNZWRpYUNh cGFiaWxpdGllczo6ZGVjb2RpbmdJbmZvKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQs IE1lZGlhRGVjb2QKICAgICB9CiAKICAgICBtX2RlY29kaW5nVGFza3MuYWRkKCsrbV9uZXh0VGFz a0lkZW50aWZpZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKLSAgICBjb250ZXh0LnBvc3RUYXNrVG9S ZXNwb25zaWJsZURvY3VtZW50KFtjb25maWd1cmF0aW9uID0gV1RGTW92ZShjb25maWd1cmF0aW9u KS5pc29sYXRlZENvcHkoKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmNvbnRleHRJZGVu dGlmaWVyKCksIHdlYWtUaGlzID0gV2Vha1B0ciB7IHRoaXMgfSwgdGFza0lkZW50aWZpZXIgPSBt X25leHRUYXNrSWRlbnRpZmllcl0oYXV0byYgZG9jdW1lbnQpIG11dGFibGUgeworICAgIGNvbnRl eHQucG9zdFRhc2tUb1Jlc3BvbnNpYmxlRG9jdW1lbnQoW2NvbmZpZ3VyYXRpb24gPSBXVEZNb3Zl KGNvbmZpZ3VyYXRpb24pLmlzb2xhdGVkQ29weSgpLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRl eHQuaWRlbnRpZmllcigpLCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyB0aGlzIH0sIHRhc2tJZGVudGlm aWVyID0gbV9uZXh0VGFza0lkZW50aWZpZXJdKGF1dG8mIGRvY3VtZW50KSBtdXRhYmxlIHsKICAg ICAgICAgZ2F0aGVyRGVjb2RpbmdJbmZvKGRvY3VtZW50LCBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24p LCBbY29udGV4dElkZW50aWZpZXIsIHdlYWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHRhc2tJ ZGVudGlmaWVyXShhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAgIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50aWZpZXIsIFt3ZWFrVGhpcyA9 IFdURk1vdmUod2Vha1RoaXMpLCB0YXNrSWRlbnRpZmllciwgcmVzdWx0ID0gV1RGTW92ZShyZXN1 bHQpLmlzb2xhdGVkQ29weSgpXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYg KCF3ZWFrVGhpcykKQEAgLTMxNCw3ICszMTQsNyBAQCB2b2lkIE1lZGlhQ2FwYWJpbGl0aWVzOjpl bmNvZGluZ0luZm8oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgTWVkaWFFbmNvZAog ICAgIH0KIAogICAgIG1fZW5jb2RpbmdUYXNrcy5hZGQoKyttX25leHRUYXNrSWRlbnRpZmllciwg V1RGTW92ZShjYWxsYmFjaykpOwotICAgIGNvbnRleHQucG9zdFRhc2tUb1Jlc3BvbnNpYmxlRG9j dW1lbnQoW2NvbmZpZ3VyYXRpb24gPSBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pLmlzb2xhdGVkQ29w eSgpLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSwgd2Vh a1RoaXMgPSBXZWFrUHRyIHsgdGhpcyB9LCB0YXNrSWRlbnRpZmllciA9IG1fbmV4dFRhc2tJZGVu dGlmaWVyXShhdXRvJiBkb2N1bWVudCkgbXV0YWJsZSB7CisgICAgY29udGV4dC5wb3N0VGFza1Rv UmVzcG9uc2libGVEb2N1bWVudChbY29uZmlndXJhdGlvbiA9IFdURk1vdmUoY29uZmlndXJhdGlv bikuaXNvbGF0ZWRDb3B5KCksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5pZGVudGlmaWVy KCksIHdlYWtUaGlzID0gV2Vha1B0ciB7IHRoaXMgfSwgdGFza0lkZW50aWZpZXIgPSBtX25leHRU YXNrSWRlbnRpZmllcl0oYXV0byYgZG9jdW1lbnQpIG11dGFibGUgewogICAgICAgICBnYXRoZXJF bmNvZGluZ0luZm8oZG9jdW1lbnQsIFdURk1vdmUoY29uZmlndXJhdGlvbiksIFtjb250ZXh0SWRl bnRpZmllciwgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgdGFza0lkZW50aWZpZXJdKGF1 dG8mJiByZXN1bHQpIG11dGFibGUgewogICAgICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW3dlYWtUaGlzID0gV1RGTW92ZSh3ZWFr VGhpcyksIHRhc2tJZGVudGlmaWVyLCByZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCkuaXNvbGF0ZWRD b3B5KCldKGF1dG8mKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hh bm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFu bmVsLmNwcAppbmRleCAwNjUzOTRmZDA0NDc4YmVmYjRjY2E0ZjYyODVjY2JhNzlmMGRjNjZmLi44 ZjgzMzczZGJjNzRiNTJjNDU1NTMwNmE1MDU2ZDJmZGUwZWFhZTc1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmNwcApAQCAt NzEsNyArNzEsNyBAQCBSZWY8UlRDRGF0YUNoYW5uZWw+IFJUQ0RhdGFDaGFubmVsOjpjcmVhdGUo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgc3RkOgogICAgICAgICBpZiAoIWNoYW5u ZWwtPm1faGFuZGxlcikKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKGF1dG8qIGNv bnRleHQgPSBjaGFubmVsLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCi0gICAgICAgICAgICBj aGFubmVsLT5tX2hhbmRsZXItPnNldENsaWVudCgqY2hhbm5lbCwgY29udGV4dC0+Y29udGV4dElk ZW50aWZpZXIoKSk7CisgICAgICAgICAgICBjaGFubmVsLT5tX2hhbmRsZXItPnNldENsaWVudCgq Y2hhbm5lbCwgY29udGV4dC0+aWRlbnRpZmllcigpKTsKICAgICB9KTsKICAgICByZXR1cm4gY2hh bm5lbDsKIH0KQEAgLTk3LDcgKzk3LDcgQEAgUlRDRGF0YUNoYW5uZWw6OlJUQ0RhdGFDaGFubmVs KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIHN0ZDo6dW5pcXVlX3B0cjwKICAgICA6 IEFjdGl2ZURPTU9iamVjdCgmY29udGV4dCkKICAgICAsIG1faGFuZGxlcihXVEZNb3ZlKGhhbmRs ZXIpKQogICAgICwgbV9pZGVudGlmaWVyKFJUQ0RhdGFDaGFubmVsSWRlbnRpZmllciB7IFByb2Nl c3M6OmlkZW50aWZpZXIoKSwgT2JqZWN0SWRlbnRpZmllcjxSVENEYXRhQ2hhbm5lbExvY2FsSWRl bnRpZmllclR5cGU+OjpnZW5lcmF0ZVRocmVhZFNhZmUoKSB9KQotICAgICwgbV9jb250ZXh0SWRl bnRpZmllcihjb250ZXh0LmlzRG9jdW1lbnQoKSA/IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVu dGlmaWVyIHsgfSA6IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSkKKyAgICAsIG1fY29udGV4 dElkZW50aWZpZXIoY29udGV4dC5pc0RvY3VtZW50KCkgPyBTY3JpcHRFeGVjdXRpb25Db250ZXh0 SWRlbnRpZmllciB7IH0gOiBjb250ZXh0LmlkZW50aWZpZXIoKSkKICAgICAsIG1fbGFiZWwoV1RG TW92ZShsYWJlbCkpCiAgICAgLCBtX29wdGlvbnMoV1RGTW92ZShvcHRpb25zKSkKICAgICAsIG1f bWVzc2FnZVF1ZXVlKGNyZWF0ZU1lc3NhZ2VRdWV1ZShjb250ZXh0LCAqdGhpcykpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNGcmFtZVRyYW5z Zm9ybS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNGcmFt ZVRyYW5zZm9ybS5jcHAKaW5kZXggMTI2OGJhNTYxN2VjZmM2MTFkNWZmYTQ1NDc0YjM5NDIxNzE5 MWJmZC4uODM0MjA3MGNhY2JmYzI0MzY5ZWNhMzExZjFkMzg2NDg0YzliYTIyOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTRnJhbWVUcmFuc2Zv cm0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0Zy YW1lVHJhbnNmb3JtLmNwcApAQCAtMTU5LDcgKzE1OSw3IEBAIHZvaWQgUlRDUnRwU0ZyYW1lVHJh bnNmb3JtOjppbml0aWFsaXplVHJhbnNmb3JtZXIoUlRDUnRwVHJhbnNmb3JtQmFja2VuZCYgYmFj a2VuCiAgICAgbV90cmFuc2Zvcm1lci0+c2V0SXNFbmNyeXB0aW5nKHNpZGUgPT0gU2lkZTo6U2Vu ZGVyKTsKICAgICBtX3RyYW5zZm9ybWVyLT5zZXRNZWRpYVR5cGUoYmFja2VuZC5tZWRpYVR5cGUo KSk7CiAKLSAgICBiYWNrZW5kLnNldFRyYW5zZm9ybWFibGVGcmFtZUNhbGxiYWNrKFt0cmFuc2Zv cm1lciA9IG1fdHJhbnNmb3JtZXIsIGlkZW50aWZpZXIgPSBjb250ZXh0LT5jb250ZXh0SWRlbnRp ZmllcigpLCBiYWNrZW5kID0gUmVmIHsgYmFja2VuZCB9LCB3ZWFrVGhpcyA9IFdlYWtQdHIgeyAq dGhpcyB9XShhdXRvJiYgZnJhbWUpIHsKKyAgICBiYWNrZW5kLnNldFRyYW5zZm9ybWFibGVGcmFt ZUNhbGxiYWNrKFt0cmFuc2Zvcm1lciA9IG1fdHJhbnNmb3JtZXIsIGlkZW50aWZpZXIgPSBjb250 ZXh0LT5pZGVudGlmaWVyKCksIGJhY2tlbmQgPSBSZWYgeyBiYWNrZW5kIH0sIHdlYWtUaGlzID0g V2Vha1B0ciB7ICp0aGlzIH1dKGF1dG8mJiBmcmFtZSkgewogICAgICAgICBhdXRvIGNodW5rID0g ZnJhbWUtPmRhdGEoKTsKICAgICAgICAgaWYgKCFjaHVuay5kYXRhKCkgfHwgIWNodW5rLnNpemUo KSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTIzMSwxMyArMjMxLDEzIEBAIEV4Y2VwdGlvbk9y PHZvaWQ+IFJUQ1J0cFNGcmFtZVRyYW5zZm9ybTo6Y3JlYXRlU3RyZWFtcygpCiAKICAgICAgICAg Ly8gV2UgZG8gbm90IHdhbnQgdG8gdGhyb3cgYW55IGV4Y2VwdGlvbiBpbiB0aGUgdHJhbnNmb3Jt IHRvIG1ha2Ugc3VyZSB3ZSBkbyBub3QgZXJyb3IgdGhlIHRyYW5zZm9ybS4KICAgICAgICAgV1RG Ojpzd2l0Y2hPbihmcmFtZSwgWyZdKFJlZlB0cjxSVENFbmNvZGVkQXVkaW9GcmFtZT4mIHZhbHVl KSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJh bnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwgY29udGV4dC5jb250ZXh0SWRl bnRpZmllcigpLCB3ZWFrVGhpcyk7CisgICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUs IGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwg Y29udGV4dC5pZGVudGlmaWVyKCksIHdlYWtUaGlzKTsKICAgICAgICAgfSwgWyZdKFJlZlB0cjxS VENFbmNvZGVkVmlkZW9GcmFtZT4mIHZhbHVlKSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFt ZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0KCksICpyZWFkYWJsZVN0cmVh bVNvdXJjZSwgY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpLCB3ZWFrVGhpcyk7CisgICAgICAg ICAgICB0cmFuc2Zvcm1GcmFtZSgqdmFsdWUsIGdsb2JhbE9iamVjdCwgdHJhbnNmb3JtZXIuZ2V0 KCksICpyZWFkYWJsZVN0cmVhbVNvdXJjZSwgY29udGV4dC5pZGVudGlmaWVyKCksIHdlYWtUaGlz KTsKICAgICAgICAgfSwgWyZdKFJlZlB0cjxBcnJheUJ1ZmZlcj4mIHZhbHVlKSB7Ci0gICAgICAg ICAgICB0cmFuc2Zvcm1GcmFtZSh7IHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QqPih2YWx1ZS0+ ZGF0YSgpKSwgdmFsdWUtPmJ5dGVMZW5ndGgoKSB9LCBnbG9iYWxPYmplY3QsIHRyYW5zZm9ybWVy LmdldCgpLCAqcmVhZGFibGVTdHJlYW1Tb3VyY2UsIGNvbnRleHQuY29udGV4dElkZW50aWZpZXIo KSwgd2Vha1RoaXMpOworICAgICAgICAgICAgdHJhbnNmb3JtRnJhbWUoeyBzdGF0aWNfY2FzdDxj b25zdCB1aW50OF90Kj4odmFsdWUtPmRhdGEoKSksIHZhbHVlLT5ieXRlTGVuZ3RoKCkgfSwgZ2xv YmFsT2JqZWN0LCB0cmFuc2Zvcm1lci5nZXQoKSwgKnJlYWRhYmxlU3RyZWFtU291cmNlLCBjb250 ZXh0LmlkZW50aWZpZXIoKSwgd2Vha1RoaXMpOwogICAgICAgICB9LCBbJl0oUmVmUHRyPEFycmF5 QnVmZmVyVmlldz4mIHZhbHVlKSB7Ci0gICAgICAgICAgICB0cmFuc2Zvcm1GcmFtZSh7IHN0YXRp Y19jYXN0PGNvbnN0IHVpbnQ4X3QqPih2YWx1ZS0+ZGF0YSgpKSwgdmFsdWUtPmJ5dGVMZW5ndGgo KSB9LCBnbG9iYWxPYmplY3QsIHRyYW5zZm9ybWVyLmdldCgpLCAqcmVhZGFibGVTdHJlYW1Tb3Vy Y2UsIGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKSwgd2Vha1RoaXMpOworICAgICAgICAgICAg dHJhbnNmb3JtRnJhbWUoeyBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4odmFsdWUtPmRhdGEo KSksIHZhbHVlLT5ieXRlTGVuZ3RoKCkgfSwgZ2xvYmFsT2JqZWN0LCB0cmFuc2Zvcm1lci5nZXQo KSwgKnJlYWRhYmxlU3RyZWFtU291cmNlLCBjb250ZXh0LmlkZW50aWZpZXIoKSwgd2Vha1RoaXMp OwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9KSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0uY3BwCmluZGV4IDQ4MWJiZjFjOWY2ZTc4ZWE0YmIy ZDczMTY1MjAzOTM4NGU2YTA3MWMuLmZmOTg2NDY2MzhjZmMyNmI1ZDU1Y2M2ZTE1ZTUxZTA5N2U2 OTZjYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9DcnlwdG9BbGdvcml0aG0uY3BwCkBAIC05 Niw3ICs5Niw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFJlc3VsdENhbGxiYWNrVHlwZSwgdHlwZW5h bWUgT3BlcmF0aW9uVHlwZT4KIHN0YXRpYyB2b2lkIGRpc3BhdGNoQWxnb3JpdGhtT3BlcmF0aW9u KFdvcmtRdWV1ZSYgd29ya1F1ZXVlLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBS ZXN1bHRDYWxsYmFja1R5cGUmJiBjYWxsYmFjaywgQ3J5cHRvQWxnb3JpdGhtOjpFeGNlcHRpb25D YWxsYmFjayYmIGV4Y2VwdGlvbkNhbGxiYWNrLCBPcGVyYXRpb25UeXBlJiYgb3BlcmF0aW9uKQog ewogICAgIHdvcmtRdWV1ZS5kaXNwYXRjaCgKLSAgICAgICAgW29wZXJhdGlvbiA9IFdURk1vdmUo b3BlcmF0aW9uKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgZXhjZXB0aW9uQ2FsbGJh Y2sgPSBXVEZNb3ZlKGV4Y2VwdGlvbkNhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250 ZXh0LmNvbnRleHRJZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CisgICAgICAgIFtvcGVyYXRpb24g PSBXVEZNb3ZlKG9wZXJhdGlvbiksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGV4Y2Vw dGlvbkNhbGxiYWNrID0gV1RGTW92ZShleGNlcHRpb25DYWxsYmFjayksIGNvbnRleHRJZGVudGlm aWVyID0gY29udGV4dC5pZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRv IHJlc3VsdCA9IG9wZXJhdGlvbigpOwogICAgICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW3Jlc3VsdCA9IGNyb3NzVGhyZWFkQ29w eShyZXN1bHQpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBleGNlcHRpb25DYWxsYmFj ayA9IFdURk1vdmUoZXhjZXB0aW9uQ2FsbGJhY2spXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAg ICAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtRUNESC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcAppbmRl eCA3NzZkMzliYTNiZWIzZTk1MmNkZmQ3YjVlZDM5ZGVkMWE2OWNlN2Q5Li44ZGY0OTM4ZGM5ZjU0 NjI3MzA0ODhhY2EzMDMzNTk3ZDY0ZDEwYmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j cnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1FQ0RILmNwcApAQCAtMTExLDcg KzExMSw3IEBAIHZvaWQgQ3J5cHRvQWxnb3JpdGhtRUNESDo6ZGVyaXZlQml0cyhjb25zdCBDcnlw dG9BbGdvcml0aG1QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzCiAgICAgLy8gVGhpcyBpcyBhIHNwZWNp YWwgY2FzZSB0aGF0IGNhbid0IHVzZSBkaXNwYXRjaE9wZXJhdGlvbigpIGJlY2F1c2UgaXQgYnVu ZGxlcwogICAgIC8vIHRoZSByZXN1bHQgdmFsaWRhdGlvbiBhbmQgY2FsbGJhY2sgZGlzcGF0Y2gg aW50byB1bmlmaWVkQ2FsbGJhY2suCiAgICAgd29ya1F1ZXVlLmRpc3BhdGNoKAotICAgICAgICBb YmFzZUtleSA9IFdURk1vdmUoYmFzZUtleSksIHB1YmxpY0tleSA9IGVjUGFyYW1ldGVycy5wdWJs aWNLZXksIGxlbmd0aCwgdW5pZmllZENhbGxiYWNrID0gV1RGTW92ZSh1bmlmaWVkQ2FsbGJhY2sp LCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZpZXIoKV0oKSBtdXRh YmxlIHsKKyAgICAgICAgW2Jhc2VLZXkgPSBXVEZNb3ZlKGJhc2VLZXkpLCBwdWJsaWNLZXkgPSBl Y1BhcmFtZXRlcnMucHVibGljS2V5LCBsZW5ndGgsIHVuaWZpZWRDYWxsYmFjayA9IFdURk1vdmUo dW5pZmllZENhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIo KV0oKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGF1dG8gZGVyaXZlZEtleSA9IHBsYXRmb3JtRGVy aXZlQml0cyhkb3duY2FzdDxDcnlwdG9LZXlFQz4oYmFzZUtleS5nZXQoKSksIGRvd25jYXN0PENy eXB0b0tleUVDPigqcHVibGljS2V5KSk7CiAgICAgICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250 ZXh0Ojpwb3N0VGFza1RvKGNvbnRleHRJZGVudGlmaWVyLCBbZGVyaXZlZEtleSA9IFdURk1vdmUo ZGVyaXZlZEtleSksIGxlbmd0aCwgdW5pZmllZENhbGxiYWNrID0gV1RGTW92ZSh1bmlmaWVkQ2Fs bGJhY2spXShhdXRvJikgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgdW5pZmllZENhbGxiYWNr KFdURk1vdmUoZGVyaXZlZEtleSksIGxlbmd0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEExLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCmluZGV4IDJmN2Yy NWJiMjU1MGE3MjU1Mzg1NDc0MzU2YWE2Nzg4YmRiZDI0OWMuLjE0ZGNhNjM5YmExYjUxMjgyOGZh N2QwZTEyNzBmNDQ4NDM1ODdhYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9h bGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Ny eXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTEuY3BwCkBAIC01MSw3ICs1MSw3IEBA IHZvaWQgQ3J5cHRvQWxnb3JpdGhtU0hBMTo6ZGlnZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3Nh Z2UsIFZlY3RvckNhbGxiYWNrJiYgY2FsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICB3 b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdU Rk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNvbnRleHRJZGVu dGlmaWVyID0gY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpXSgpIG11dGFibGUgeworICAgIHdv cmtRdWV1ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdlc3QpLCBtZXNzYWdlID0gV1RG TW92ZShtZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgY29udGV4dElkZW50 aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIoKV0oKSBtdXRhYmxlIHsKICAgICAgICAgZGlnZXN0 LT5hZGRCeXRlcyhtZXNzYWdlLmRhdGEoKSwgbWVzc2FnZS5zaXplKCkpOwogICAgICAgICBhdXRv IHJlc3VsdCA9IGRpZ2VzdC0+Y29tcHV0ZUhhc2goKTsKICAgICAgICAgU2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwgW2NhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0oYXV0byYpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTIy NC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1T SEEyMjQuY3BwCmluZGV4IDZlMTgxMGM5NGY5YmE2MjFmOTg4YWI5MzI3M2Q3NjUxZjk3NjdlMGQu LjVhZTgyYzQzYjY1OGZkYzNmYTA1MmFkMTUyNDI1Yzg3MTA5NWYwY2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTIyNC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hB MjI0LmNwcApAQCAtNTEsNyArNTEsNyBAQCB2b2lkIENyeXB0b0FsZ29yaXRobVNIQTIyNDo6ZGln ZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3NhZ2UsIFZlY3RvckNhbGxiYWNrJiYgYwogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgd29ya1F1ZXVlLmRpc3BhdGNoKFtkaWdlc3QgPSBXVEZN b3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2UpLCBjYWxsYmFjayA9IFdURk1v dmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQuY29udGV4dElkZW50aWZp ZXIoKV0oKSBtdXRhYmxlIHsKKyAgICB3b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1v dmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5pZGVudGlmaWVyKCldKCkg bXV0YWJsZSB7CiAgICAgICAgIGRpZ2VzdC0+YWRkQnl0ZXMobWVzc2FnZS5kYXRhKCksIG1lc3Nh Z2Uuc2l6ZSgpKTsKICAgICAgICAgYXV0byByZXN1bHQgPSBkaWdlc3QtPmNvbXB1dGVIYXNoKCk7 CiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnBvc3RUYXNrVG8oY29udGV4dElkZW50 aWZpZXIsIFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCByZXN1bHQgPSBXVEZNb3ZlKHJl c3VsdCldKGF1dG8mKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3Jp dGhtcy9DcnlwdG9BbGdvcml0aG1TSEEyNTYuY3BwIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2Fs Z29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMjU2LmNwcAppbmRleCA4Njk0MzI1MmMyN2UwNWFi Y2E1NDgyNzMzMzEwMzMzNzg2YzE0NmNmLi40NjJjMmQ0M2VkMWUzMjUzNzg3ZDc5NmU3NDJjNjQx YjZhZTEzMGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9D cnlwdG9BbGdvcml0aG1TSEEyNTYuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdv cml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTI1Ni5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdm9pZCBD cnlwdG9BbGdvcml0aG1TSEEyNTY6OmRpZ2VzdChWZWN0b3I8dWludDhfdD4mJiBtZXNzYWdlLCBW ZWN0b3JDYWxsYmFjayYmIGMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHdvcmtRdWV1 ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdlc3QpLCBtZXNzYWdlID0gV1RGTW92ZSht ZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgY29udGV4dElkZW50aWZpZXIg PSBjb250ZXh0LmNvbnRleHRJZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CisgICAgd29ya1F1ZXVl LmRpc3BhdGNoKFtkaWdlc3QgPSBXVEZNb3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1l c3NhZ2UpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9 IGNvbnRleHQuaWRlbnRpZmllcigpXSgpIG11dGFibGUgewogICAgICAgICBkaWdlc3QtPmFkZEJ5 dGVzKG1lc3NhZ2UuZGF0YSgpLCBtZXNzYWdlLnNpemUoKSk7CiAgICAgICAgIGF1dG8gcmVzdWx0 ID0gZGlnZXN0LT5jb21wdXRlSGFzaCgpOwogICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0 Ojpwb3N0VGFza1RvKGNvbnRleHRJZGVudGlmaWVyLCBbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKSwgcmVzdWx0ID0gV1RGTW92ZShyZXN1bHQpXShhdXRvJikgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMzg0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0FsZ29yaXRobVNIQTM4NC5j cHAKaW5kZXggODQwZGZhZTI2MWFiNzU5MTM1NjBlOTQ0ZTNmZDg3MDFjNTBlNGUzNi4uYmJlZGE1 ZWI4NmQ4N2RiNzEwNDc0ODJkMDg5ZTBlYTg4MmI1MjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3J5cHRvL2FsZ29yaXRobXMvQ3J5cHRvQWxnb3JpdGhtU0hBMzg0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGhtcy9DcnlwdG9BbGdvcml0aG1TSEEzODQuY3Bw CkBAIC01MSw3ICs1MSw3IEBAIHZvaWQgQ3J5cHRvQWxnb3JpdGhtU0hBMzg0OjpkaWdlc3QoVmVj dG9yPHVpbnQ4X3Q+JiYgbWVzc2FnZSwgVmVjdG9yQ2FsbGJhY2smJiBjCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICB3b3JrUXVldWUuZGlzcGF0Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGln ZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxs YmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4dC5jb250ZXh0SWRlbnRpZmllcigpXSgp IG11dGFibGUgeworICAgIHdvcmtRdWV1ZS5kaXNwYXRjaChbZGlnZXN0ID0gV1RGTW92ZShkaWdl c3QpLCBtZXNzYWdlID0gV1RGTW92ZShtZXNzYWdlKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKSwgY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0LmlkZW50aWZpZXIoKV0oKSBtdXRhYmxl IHsKICAgICAgICAgZGlnZXN0LT5hZGRCeXRlcyhtZXNzYWdlLmRhdGEoKSwgbWVzc2FnZS5zaXpl KCkpOwogICAgICAgICBhdXRvIHJlc3VsdCA9IGRpZ2VzdC0+Y29tcHV0ZUhhc2goKTsKICAgICAg ICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cG9zdFRhc2tUbyhjb250ZXh0SWRlbnRpZmllciwg W2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0o YXV0byYpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0Ny eXB0b0FsZ29yaXRobVNIQTUxMi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vYWxnb3JpdGht cy9DcnlwdG9BbGdvcml0aG1TSEE1MTIuY3BwCmluZGV4IDkzODhjNWY4M2MzYWJhOTQyYmVlZTg2 MGM4Mzk5ODAxNWM0N2JkODUuLjBjYjIzYjhmZGJiM2ViMmFmMDZkZWQzN2YyZGUxY2NjZDI1ZTZi YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9hbGdvcml0aG1zL0NyeXB0b0Fs Z29yaXRobVNIQTUxMi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3J5cHRvL2FsZ29yaXRobXMv Q3J5cHRvQWxnb3JpdGhtU0hBNTEyLmNwcApAQCAtNTEsNyArNTEsNyBAQCB2b2lkIENyeXB0b0Fs Z29yaXRobVNIQTUxMjo6ZGlnZXN0KFZlY3Rvcjx1aW50OF90PiYmIG1lc3NhZ2UsIFZlY3RvckNh bGxiYWNrJiYgYwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgd29ya1F1ZXVlLmRpc3Bh dGNoKFtkaWdlc3QgPSBXVEZNb3ZlKGRpZ2VzdCksIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2Up LCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRl eHQuY29udGV4dElkZW50aWZpZXIoKV0oKSBtdXRhYmxlIHsKKyAgICB3b3JrUXVldWUuZGlzcGF0 Y2goW2RpZ2VzdCA9IFdURk1vdmUoZGlnZXN0KSwgbWVzc2FnZSA9IFdURk1vdmUobWVzc2FnZSks IGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGNvbnRleHRJZGVudGlmaWVyID0gY29udGV4 dC5pZGVudGlmaWVyKCldKCkgbXV0YWJsZSB7CiAgICAgICAgIGRpZ2VzdC0+YWRkQnl0ZXMobWVz c2FnZS5kYXRhKCksIG1lc3NhZ2Uuc2l6ZSgpKTsKICAgICAgICAgYXV0byByZXN1bHQgPSBkaWdl c3QtPmNvbXB1dGVIYXNoKCk7CiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnBvc3RU YXNrVG8oY29udGV4dElkZW50aWZpZXIsIFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBy ZXN1bHQgPSBXVEZNb3ZlKHJlc3VsdCldKGF1dG8mKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jcnlwdG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jcnlw dG8vbWFjL0NyeXB0b0tleVJTQU1hYy5jcHAKaW5kZXggOTE2NmNhNTUwODY2ZDM5MjNiMWVlZDc2 Nzc5ZGIxNThlYzBhNDkyMS4uYjkyYmRkYjRiMzMwNmI3NWY1ODFmMjU0M2ZmZDE4ZTkxMDM2N2E0 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL21hYy9DcnlwdG9LZXlSU0FNYWMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9tYWMvQ3J5cHRvS2V5UlNBTWFjLmNwcApA QCAtMjc3LDcgKzI3Nyw3IEBAIHZvaWQgQ3J5cHRvS2V5UlNBOjpnZW5lcmF0ZVBhaXIoQ3J5cHRv QWxnb3JpdGhtSWRlbnRpZmllciBhbGdvcml0aG0sIENyeXB0b0FsZ29yCiAKICAgICBfX2Jsb2Nr IGF1dG8gYmxvY2tDYWxsYmFjayhXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgX19ibG9jayBhdXRv IGJsb2NrRmFpbHVyZUNhbGxiYWNrKFdURk1vdmUoZmFpbHVyZUNhbGxiYWNrKSk7Ci0gICAgYXV0 byBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQtPmNvbnRleHRJZGVudGlmaWVyKCk7CisgICAg YXV0byBjb250ZXh0SWRlbnRpZmllciA9IGNvbnRleHQtPmlkZW50aWZpZXIoKTsKICAgICBkaXNw YXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9S SVRZX0RFRkFVTFQsIDApLCBeewogICAgICAgICBDQ1JTQUNyeXB0b3JSZWYgY2NQdWJsaWNLZXkg PSBudWxscHRyOwogICAgICAgICBDQ1JTQUNyeXB0b3JSZWYgY2NQcml2YXRlS2V5ID0gbnVsbHB0 cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ccm9hZGNhc3RDaGFubmVsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Ccm9hZGNhc3RDaGFubmVsLmNwcAppbmRleCA3MTJlMjhhNWIz ZGY1YjEwNTNmYzk5OWU2NTZhM2U1YmIwNzI4YTI1Li43NGFjZTNlYTljZWU4MzY2MjdkMzkzZDBj Y2U5MzU5YTFjZDM0ZDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQnJvYWRjYXN0 Q2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Jyb2FkY2FzdENoYW5uZWwuY3Bw CkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBCcm9hZGNhc3RDaGFubmVsOjpNYWluVGhyZWFkQnJp ZGdlOjplbnN1cmVPbk1haW5UaHJlYWQoRnVuY3Rpb248dm9pZChEb2N1bWUKIAogdm9pZCBCcm9h ZGNhc3RDaGFubmVsOjpNYWluVGhyZWFkQnJpZGdlOjpyZWdpc3RlckNoYW5uZWwoKQogewotICAg IGVuc3VyZU9uTWFpblRocmVhZChbdGhpcywgY29udGV4dElkZW50aWZpZXIgPSBtX2Jyb2FkY2Fz dENoYW5uZWwtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+Y29udGV4dElkZW50aWZpZXIoKV0o YXV0byYgZG9jdW1lbnQpIHsKKyAgICBlbnN1cmVPbk1haW5UaHJlYWQoW3RoaXMsIGNvbnRleHRJ ZGVudGlmaWVyID0gbV9icm9hZGNhc3RDaGFubmVsLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkt PmlkZW50aWZpZXIoKV0oYXV0byYgZG9jdW1lbnQpIHsKICAgICAgICAgbV9vcmlnaW4gPSB7IHNo b3VsZFBhcnRpdGlvbk9yaWdpbihkb2N1bWVudCkgPyBkb2N1bWVudC50b3BPcmlnaW4oKS5kYXRh KCkgOiBkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLmRhdGEoKSwgZG9jdW1lbnQuc2VjdXJpdHlP cmlnaW4oKS5kYXRhKCkgfTsKICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBkb2N1bWVudC5wYWdl KCkpCiAgICAgICAgICAgICBwYWdlLT5icm9hZGNhc3RDaGFubmVsUmVnaXN0cnkoKS5yZWdpc3Rl ckNoYW5uZWwobV9vcmlnaW4sIG1fbmFtZSwgbV9pZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAppbmRleCA5ZDk2NWFmMGNhNzg3YjRj ZjA2YmQxODY3YTQwOTYxYWUzMDAxY2Q2Li5hNTZlMzBkMjQ4NzA3MzA2NDJiMzI3NTUyMThjNWEy NTYwYTRkNjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9u Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQuY3BwCkBAIC0xMTQsMTcgKzExNCwxNyBAQCBwdWJsaWM6CiB9OwogCiBTY3JpcHRFeGVjdXRp b25Db250ZXh0OjpTY3JpcHRFeGVjdXRpb25Db250ZXh0KCkKLSAgICA6IG1fY29udGV4dElkZW50 aWZpZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI6OmdlbmVyYXRlVGhyZWFkU2Fm ZSgpKQorICAgIDogbV9pZGVudGlmaWVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVy OjpnZW5lcmF0ZVRocmVhZFNhZmUoKSkKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgYWxsU2NyaXB0 RXhlY3V0aW9uQ29udGV4dHNNYXBMb2NrIH07Ci0gICAgYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4 dHNNYXAoKS5hZGQobV9jb250ZXh0SWRlbnRpZmllciwgdGhpcyk7CisgICAgYWxsU2NyaXB0RXhl Y3V0aW9uQ29udGV4dHNNYXAoKS5hZGQobV9pZGVudGlmaWVyLCB0aGlzKTsKIH0KIAogdm9pZCBT Y3JpcHRFeGVjdXRpb25Db250ZXh0OjpyZW1vdmVGcm9tQ29udGV4dHNNYXAoKQogewogICAgIExv Y2tlciBsb2NrZXIgeyBhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcExvY2sgfTsKLSAgICBB U1NFUlQoYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4dHNNYXAoKS5jb250YWlucyhtX2NvbnRleHRJ ZGVudGlmaWVyKSk7Ci0gICAgYWxsU2NyaXB0RXhlY3V0aW9uQ29udGV4dHNNYXAoKS5yZW1vdmUo bV9jb250ZXh0SWRlbnRpZmllcik7CisgICAgQVNTRVJUKGFsbFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRzTWFwKCkuY29udGFpbnMobV9pZGVudGlmaWVyKSk7CisgICAgYWxsU2NyaXB0RXhlY3V0aW9u Q29udGV4dHNNYXAoKS5yZW1vdmUobV9pZGVudGlmaWVyKTsKIH0KIAogI2lmICFBU1NFUlRfRU5B QkxFRApAQCAtMTU4LDcgKzE1OCw3IEBAIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6On5TY3JpcHRF eGVjdXRpb25Db250ZXh0KCkKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgIHsKICAgICAgICAgTG9j a2VyIGxvY2tlciB7IGFsbFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRzTWFwTG9jayB9OwotICAgICAg ICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcCgpLmNv bnRhaW5zKG1fY29udGV4dElkZW50aWZpZXIpLCAiQSBTY3JpcHRFeGVjdXRpb25Db250ZXh0IHN1 YmNsYXNzIGluc3RhbmNlIGltcGxlbWVudGluZyBwb3N0VGFzayBzaG91bGQgaGF2ZSBhbHJlYWR5 IHJlbW92ZWQgaXRzZWxmIGZyb20gdGhlIG1hcCIpOworICAgICAgICBBU1NFUlRfV0lUSF9NRVNT QUdFKCFhbGxTY3JpcHRFeGVjdXRpb25Db250ZXh0c01hcCgpLmNvbnRhaW5zKG1faWRlbnRpZmll ciksICJBIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgc3ViY2xhc3MgaW5zdGFuY2UgaW1wbGVtZW50 aW5nIHBvc3RUYXNrIHNob3VsZCBoYXZlIGFscmVhZHkgcmVtb3ZlZCBpdHNlbGYgZnJvbSB0aGUg bWFwIik7CiAgICAgfQogCiAgICAgbV9pblNjcmlwdEV4ZWN1dGlvbkNvbnRleHREZXN0cnVjdG9y ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25D b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCmlu ZGV4IDY1NzRjMzNmNzFlNDY3NWM5MTZhOTA2MjEzMWM0OTI1YjFhMjM0ZmMuLmFmM2IxMWM4YzM5 NTQ2N2VhZGEwNzc1OGU2NGZkMmFhNjQ1ZDQ2MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQuaApAQCAtMjgzLDkgKzI4Myw3IEBAIHB1YmxpYzoKICAgICBX RUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBwb3N0VGFza1RvKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRJZGVudGlmaWVyLCBUYXNrJiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIGVu c3VyZU9uQ29udGV4dFRocmVhZChTY3JpcHRFeGVjdXRpb25Db250ZXh0SWRlbnRpZmllciwgVGFz ayYmKTsKIAotICAgIC8vIEZJWE1FOiBQb3J0IGNhbGwgc2l0ZXMgdG8gaWRlbnRpZmllcigpIGFu ZCBkcm9wIHRoaXMgZnVuY3Rpb24uCi0gICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZp ZXIgY29udGV4dElkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHRJZGVudGlmaWVy OyB9Ci0gICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgaWRlbnRpZmllcigpIGNv bnN0IHsgcmV0dXJuIG1fY29udGV4dElkZW50aWZpZXI7IH0KKyAgICBTY3JpcHRFeGVjdXRpb25D b250ZXh0SWRlbnRpZmllciBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVy OyB9CiAKIHByb3RlY3RlZDoKICAgICBjbGFzcyBBZGRDb25zb2xlTWVzc2FnZVRhc2sgOiBwdWJs aWMgVGFzayB7CkBAIC0zNjMsNyArMzYxLDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgU3Ry aW5nIG1fZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb247Ci0gICAgbXV0YWJsZSBTY3JpcHRFeGVjdXRp b25Db250ZXh0SWRlbnRpZmllciBtX2NvbnRleHRJZGVudGlmaWVyOworICAgIG11dGFibGUgU2Ny aXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgbV9pZGVudGlmaWVyOwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy93b3JrZXIvU2VydmljZVdvcmtlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9hZ2VudHMvd29ya2VyL1NlcnZpY2VXb3JrZXJBZ2VudC5jcHAKaW5kZXggMzk0YzA5NTAw YWFiYjk0ODU4OWMxZjdmZDlhNGU1YjhhYTgyZmQ5My4uNDk0MjcxODAzOWY2N2U0MGE1YWQwYTM1 MWU4Y2NlZTBiYWE2MzM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy93b3JrZXIvU2VydmljZVdvcmtlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL3dvcmtlci9TZXJ2aWNlV29ya2VyQWdlbnQuY3BwCkBAIC01Nyw3ICs1 Nyw3IEBAIHZvaWQgU2VydmljZVdvcmtlckFnZW50Ojp3aWxsRGVzdHJveUZyb250ZW5kQW5kQmFj a2VuZChJbnNwZWN0b3I6OkRpc2Nvbm5lY3RSZWFzCiBQcm90b2NvbDo6RXJyb3JTdHJpbmdPcjxS ZWY8UHJvdG9jb2w6OlNlcnZpY2VXb3JrZXI6OkNvbmZpZ3VyYXRpb24+PiBTZXJ2aWNlV29ya2Vy QWdlbnQ6OmdldEluaXRpYWxpemF0aW9uSW5mbygpCiB7CiAgICAgcmV0dXJuIFByb3RvY29sOjpT ZXJ2aWNlV29ya2VyOjpDb25maWd1cmF0aW9uOjpjcmVhdGUoKQotICAgICAgICAuc2V0VGFyZ2V0 SWQobV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuaWRlbnRpZmllcigpKQorICAgICAgICAuc2V0 VGFyZ2V0SWQobV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuaW5zcGVjdG9ySWRlbnRpZmllcigp KQogICAgICAgICAuc2V0U2VjdXJpdHlPcmlnaW4obV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUu c2VjdXJpdHlPcmlnaW4oKS0+dG9SYXdTdHJpbmcoKSkKICAgICAgICAgLnNldFVybChtX3NlcnZp Y2VXb3JrZXJHbG9iYWxTY29wZS5jb250ZXh0RGF0YSgpLnNjcmlwdFVSTC5zdHJpbmcoKSkKICAg ICAgICAgLnNldENvbnRlbnQobV9zZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUuY29udGV4dERhdGEo KS5zY3JpcHQudG9TdHJpbmcoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29j b2EvUmVzb3VyY2VVc2FnZVRocmVhZENvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2Nv YS9SZXNvdXJjZVVzYWdlVGhyZWFkQ29jb2EubW0KaW5kZXggYjdmODQ0N2U5ZmViZDg2MDg1NGVk MzU5NzM4Mzc3ZmQ4ZDcwODRmYi4uYzhhMmZmMDdlN2Y4ZWJmNjgxYjVlOTg1OTY3MjMzYjcwMmE0 NDRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVzYWdl VGhyZWFkQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9SZXNvdXJjZVVz YWdlVGhyZWFkQ29jb2EubW0KQEAgLTE3OCw3ICsxNzgsNyBAQCB2b2lkIFJlc291cmNlVXNhZ2VU aHJlYWQ6OnBsYXRmb3JtQ29sbGVjdENQVURhdGEoSlNDOjpWTSosIFJlc291cmNlVXNhZ2VEYXRh JiBkYQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgbWFjaF9wb3J0X3Qg bWFjaFRocmVhZCA9IHRocmVhZC0+dGhyZWFkKCktPm1hY2hUaHJlYWQoKTsKICAgICAgICAgICAg IGlmIChNQUNIX1BPUlRfVkFMSUQobWFjaFRocmVhZCkpCi0gICAgICAgICAgICAgICAga25vd25X b3JrZXJUaHJlYWRzLnNldChtYWNoVGhyZWFkLCB0aHJlYWQtPmlkZW50aWZpZXIoKS5pc29sYXRl ZENvcHkoKSk7CisgICAgICAgICAgICAgICAga25vd25Xb3JrZXJUaHJlYWRzLnNldChtYWNoVGhy ZWFkLCB0aHJlYWQtPmluc3BlY3RvcklkZW50aWZpZXIoKS5pc29sYXRlZENvcHkoKSk7CiAgICAg ICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy R2xvYmFsU2NvcGUuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29w ZS5jcHAKaW5kZXggZTgzMjI4MTVkOTRlMTQ5NzJlZWZlNGFhNzNmZjQ4MTFlYmQzZjliOS4uZDFi ZTYzNmYxMmE5YTBiODcwYjMzYmNhMTY0NmY0YWUwMjQxN2MxMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAKQEAgLTg4LDcgKzg4LDcgQEAgV1RGX01B S0VfSVNPX0FMTE9DQVRFRF9JTVBMKFdvcmtlckdsb2JhbFNjb3BlKTsKIFdvcmtlckdsb2JhbFNj b3BlOjpXb3JrZXJHbG9iYWxTY29wZShXb3JrZXJUaHJlYWRUeXBlIHR5cGUsIGNvbnN0IFdvcmtl clBhcmFtZXRlcnMmIHBhcmFtcywgUmVmPFNlY3VyaXR5T3JpZ2luPiYmIG9yaWdpbiwgV29ya2Vy VGhyZWFkJiB0aHJlYWQsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0b3BPcmlnaW4sIElEQkNsaWVu dDo6SURCQ29ubmVjdGlvblByb3h5KiBjb25uZWN0aW9uUHJveHksIFNvY2tldFByb3ZpZGVyKiBz b2NrZXRQcm92aWRlcikKICAgICA6IFdvcmtlck9yV29ya2xldEdsb2JhbFNjb3BlKHR5cGUsIGlz TWFpblRocmVhZCgpID8gUmVmIHsgY29tbW9uVk0oKSB9IDogSlNDOjpWTTo6Y3JlYXRlKCksICZ0 aHJlYWQpCiAgICAgLCBtX3VybChwYXJhbXMuc2NyaXB0VVJMKQotICAgICwgbV9pZGVudGlmaWVy KHBhcmFtcy5pZGVudGlmaWVyKQorICAgICwgbV9pbnNwZWN0b3JJZGVudGlmaWVyKHBhcmFtcy5p bnNwZWN0b3JJZGVudGlmaWVyKQogICAgICwgbV91c2VyQWdlbnQocGFyYW1zLnVzZXJBZ2VudCkK ICAgICAsIG1faXNPbmxpbmUocGFyYW1zLmlzT25saW5lKQogICAgICwgbV9zaG91bGRCeXBhc3NN YWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3kocGFyYW1zLnNob3VsZEJ5cGFzc01haW5Xb3Js ZENvbnRlbnRTZWN1cml0eVBvbGljeSkKQEAgLTEwMyw3ICsxMDMsNyBAQCBXb3JrZXJHbG9iYWxT Y29wZTo6V29ya2VyR2xvYmFsU2NvcGUoV29ya2VyVGhyZWFkVHlwZSB0eXBlLCBjb25zdCBXb3Jr ZXJQYXJhbWV0ZQogewogICAgIHsKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IGFsbFdvcmtlckds b2JhbFNjb3BlSWRlbnRpZmllcnNMb2NrIH07Ci0gICAgICAgIGFsbFdvcmtlckdsb2JhbFNjb3Bl SWRlbnRpZmllcnMoKS5hZGQoY29udGV4dElkZW50aWZpZXIoKSk7CisgICAgICAgIGFsbFdvcmtl ckdsb2JhbFNjb3BlSWRlbnRpZmllcnMoKS5hZGQoaWRlbnRpZmllcigpKTsKICAgICB9CiAKICAg ICBpZiAobV90b3BPcmlnaW4tPmhhc1VuaXZlcnNhbEFjY2VzcygpKQpAQCAtMTI0LDcgKzEyNCw3 IEBAIFdvcmtlckdsb2JhbFNjb3BlOjp+V29ya2VyR2xvYmFsU2NvcGUoKQogCiAgICAgewogICAg ICAgICBMb2NrZXIgbG9ja2VyIHsgYWxsV29ya2VyR2xvYmFsU2NvcGVJZGVudGlmaWVyc0xvY2sg fTsKLSAgICAgICAgYWxsV29ya2VyR2xvYmFsU2NvcGVJZGVudGlmaWVycygpLnJlbW92ZShjb250 ZXh0SWRlbnRpZmllcigpKTsKKyAgICAgICAgYWxsV29ya2VyR2xvYmFsU2NvcGVJZGVudGlmaWVy cygpLnJlbW92ZShpZGVudGlmaWVyKCkpOwogICAgIH0KIAogICAgIG1fcGVyZm9ybWFuY2UgPSBu dWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxT Y29wZS5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5oCmluZGV4 IGFlM2IyZGJkYWM3ZmE0NGNlN2UzZjMyMjIwMmMwMDhiM2VjODc4ZmIuLjM1ZDczYWNjZWUzMjdl Yjg5ZGY5M2EzZmI0Y2Y5MDUzMTk4YTc3NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlckdsb2JhbFNjb3BlLmgKQEAgLTc5LDcgKzc5LDcgQEAgcHVibGljOgogCiAgICAgY29uc3Qg VVJMJiB1cmwoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3VybDsgfQogICAgIFN0cmluZyBvcmln aW4oKSBjb25zdDsKLSAgICBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVy biBtX2lkZW50aWZpZXI7IH0KKyAgICBjb25zdCBTdHJpbmcmIGluc3BlY3RvcklkZW50aWZpZXIo KSBjb25zdCB7IHJldHVybiBtX2luc3BlY3RvcklkZW50aWZpZXI7IH0KIAogICAgIElEQkNsaWVu dDo6SURCQ29ubmVjdGlvblByb3h5KiBpZGJDb25uZWN0aW9uUHJveHkoKSBmaW5hbDsKICAgICB2 b2lkIHN1c3BlbmQoKSBmaW5hbDsKQEAgLTE3Nyw3ICsxNzcsNyBAQCBwcml2YXRlOgogICAgIFN0 cmluZyB1c2VyQWdlbnQoY29uc3QgVVJMJikgY29uc3QgZmluYWw7CiAKICAgICBFdmVudFRhcmdl dCogZXJyb3JFdmVudFRhcmdldCgpIGZpbmFsOwotICAgIFN0cmluZyByZXNvdXJjZVJlcXVlc3RJ ZGVudGlmaWVyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CisgICAgU3Ry aW5nIHJlc291cmNlUmVxdWVzdElkZW50aWZpZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2lu c3BlY3RvcklkZW50aWZpZXI7IH0KICAgICBTb2NrZXRQcm92aWRlciogc29ja2V0UHJvdmlkZXIo KSBmaW5hbDsKICAgICBSZWZQdHI8UlRDRGF0YUNoYW5uZWxSZW1vdGVIYW5kbGVyQ29ubmVjdGlv bj4gY3JlYXRlUlRDRGF0YUNoYW5uZWxSZW1vdGVIYW5kbGVyQ29ubmVjdGlvbigpIGZpbmFsOwog CkBAIC0xOTEsNyArMTkxLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN0b3BJbmRleGVkRGF0YWJh c2UoKTsKIAogICAgIFVSTCBtX3VybDsKLSAgICBTdHJpbmcgbV9pZGVudGlmaWVyOworICAgIFN0 cmluZyBtX2luc3BlY3RvcklkZW50aWZpZXI7CiAgICAgU3RyaW5nIG1fdXNlckFnZW50OwogCiAg ICAgbXV0YWJsZSBSZWZQdHI8V29ya2VyTG9jYXRpb24+IG1fbG9jYXRpb247CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck9yV29ya2xldFRocmVhZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck9yV29ya2xldFRocmVhZC5jcHAKaW5kZXggMTRmYzQ4 YTVlYzRjYWIwOTliMDgyMTMyZDJjYjk4YTUzZDA1ODZjMi4uMGE5MjZjMGNkYWFkMzQ4NjZiZWUy ZDk5NWZjNDZjNmRiODI5MmE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9X b3JrZXJPcldvcmtsZXRUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y a2VyT3JXb3JrbGV0VGhyZWFkLmNwcApAQCAtNjYsOCArNjYsOCBAQCBzdGF0aWMgVW5pcXVlUmVm PFdvcmtlclJ1bkxvb3A+IGNvbnN0cnVjdFJ1bkxvb3AoV29ya2VyVGhyZWFkTW9kZSB3b3JrZXJU aHJlYWRNbwogICAgIHJldHVybiBtYWtlVW5pcXVlUmVmPFdvcmtlckRlZGljYXRlZFJ1bkxvb3A+ KCk7CiB9CiAKLVdvcmtlck9yV29ya2xldFRocmVhZDo6V29ya2VyT3JXb3JrbGV0VGhyZWFkKGNv bnN0IFN0cmluZyYgaWRlbnRpZmllciwgV29ya2VyVGhyZWFkTW9kZSB3b3JrZXJUaHJlYWRNb2Rl KQotICAgIDogbV9pZGVudGlmaWVyKGlkZW50aWZpZXIpCitXb3JrZXJPcldvcmtsZXRUaHJlYWQ6 Oldvcmtlck9yV29ya2xldFRocmVhZChjb25zdCBTdHJpbmcmIGluc3BlY3RvcklkZW50aWZpZXIs IFdvcmtlclRocmVhZE1vZGUgd29ya2VyVGhyZWFkTW9kZSkKKyAgICA6IG1faW5zcGVjdG9ySWRl bnRpZmllcihpbnNwZWN0b3JJZGVudGlmaWVyKQogICAgICwgbV9ydW5Mb29wKGNvbnN0cnVjdFJ1 bkxvb3Aod29ya2VyVGhyZWFkTW9kZSkpCiB7CiAgICAgTG9ja2VyIGxvY2tlciB7IHdvcmtlck9y V29ya2xldFRocmVhZHNMb2NrKCkgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvV29ya2VyT3JXb3JrbGV0VGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtl ck9yV29ya2xldFRocmVhZC5oCmluZGV4IGQ2NGFjNmE5ZWY4YzRlMGYzYTQ0MDA2NTIyNzhmYzVi MmMyNjM3YjkuLmUzNWZjZGNkZGI5ZGNjY2FmMjk5MDhlOTMwOGVkZDczNmE5NjkwODMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyT3JXb3JrbGV0VGhyZWFkLmgKKysr IGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJPcldvcmtsZXRUaHJlYWQuaApAQCAtNjMs MTQgKzYzLDE0IEBAIHB1YmxpYzoKICAgICB2b2lkIHN1c3BlbmQoKTsKICAgICB2b2lkIHJlc3Vt ZSgpOwogCi0gICAgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9p ZGVudGlmaWVyOyB9CisgICAgY29uc3QgU3RyaW5nJiBpbnNwZWN0b3JJZGVudGlmaWVyKCkgY29u c3QgeyByZXR1cm4gbV9pbnNwZWN0b3JJZGVudGlmaWVyOyB9CiAKICAgICBzdGF0aWMgSGFzaFNl dDxXb3JrZXJPcldvcmtsZXRUaHJlYWQqPiYgd29ya2VyT3JXb3JrbGV0VGhyZWFkcygpIFdURl9S RVFVSVJFU19MT0NLKHdvcmtlck9yV29ya2xldFRocmVhZHNMb2NrKCkpOwogICAgIHN0YXRpYyBM b2NrJiB3b3JrZXJPcldvcmtsZXRUaHJlYWRzTG9jaygpIFdURl9SRVRVUk5TX0xPQ0soc193b3Jr ZXJPcldvcmtsZXRUaHJlYWRzTG9jayk7CiAgICAgc3RhdGljIHZvaWQgcmVsZWFzZUZhc3RNYWxs b2NGcmVlTWVtb3J5SW5BbGxUaHJlYWRzKCk7CiAKIHByb3RlY3RlZDoKLSAgICBleHBsaWNpdCBX b3JrZXJPcldvcmtsZXRUaHJlYWQoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBXb3JrZXJUaHJl YWRNb2RlID0gV29ya2VyVGhyZWFkTW9kZTo6Q3JlYXRlTmV3VGhyZWFkKTsKKyAgICBleHBsaWNp dCBXb3JrZXJPcldvcmtsZXRUaHJlYWQoY29uc3QgU3RyaW5nJiBpbnNwZWN0b3JJZGVudGlmaWVy LCBXb3JrZXJUaHJlYWRNb2RlID0gV29ya2VyVGhyZWFkTW9kZTo6Q3JlYXRlTmV3VGhyZWFkKTsK ICAgICB2b2lkIHdvcmtlck9yV29ya2xldFRocmVhZCgpOwogCiAgICAgLy8gRXhlY3V0ZXMgdGhl IGV2ZW50IGxvb3AgZm9yIHRoZSB3b3JrZXIgdGhyZWFkLiBEZXJpdmVkIGNsYXNzZXMgY2FuIG92 ZXJyaWRlIHRvIHBlcmZvcm0gYWN0aW9ucyBiZWZvcmUvYWZ0ZXIgZW50ZXJpbmcgdGhlIGV2ZW50 IGxvb3AuCkBAIC04NCw3ICs4NCw3IEBAIHByaXZhdGU6CiAKICAgICBzdGF0aWMgTG9jayBzX3dv cmtlck9yV29ya2xldFRocmVhZHNMb2NrOwogCi0gICAgU3RyaW5nIG1faWRlbnRpZmllcjsKKyAg ICBTdHJpbmcgbV9pbnNwZWN0b3JJZGVudGlmaWVyOwogICAgIExvY2sgbV90aHJlYWRDcmVhdGlv bkFuZEdsb2JhbFNjb3BlTG9jazsKICAgICBSZWZQdHI8V29ya2VyT3JXb3JrbGV0R2xvYmFsU2Nv cGU+IG1fZ2xvYmFsU2NvcGU7CiAgICAgUmVmUHRyPFRocmVhZD4gbV90aHJlYWQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5jcHAKaW5kZXggZWY3MGFmMTdkMDA0ODFkYzIzMWVm NWE2ZjAzMzA5MmMyZTA4NjllYS4uNGQ5YWY1NmMyY2I4ZjNmZDEwNzhhNTFjOTc3M2ZlMjMzNjY3 ZTQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJUaHJlYWQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyVGhyZWFkLmNwcApAQCAtNTAsNyAr NTAsNyBAQCBXb3JrZXJQYXJhbWV0ZXJzIFdvcmtlclBhcmFtZXRlcnM6Omlzb2xhdGVkQ29weSgp IGNvbnN0CiAgICAgcmV0dXJuIHsKICAgICAgICAgc2NyaXB0VVJMLmlzb2xhdGVkQ29weSgpLAog ICAgICAgICBuYW1lLmlzb2xhdGVkQ29weSgpLAotICAgICAgICBpZGVudGlmaWVyLmlzb2xhdGVk Q29weSgpLAorICAgICAgICBpbnNwZWN0b3JJZGVudGlmaWVyLmlzb2xhdGVkQ29weSgpLAogICAg ICAgICB1c2VyQWdlbnQuaXNvbGF0ZWRDb3B5KCksCiAgICAgICAgIGlzT25saW5lLAogICAgICAg ICBjb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMsCkBAIC04Nyw3ICs4Nyw3IEBA IFdvcmtlclRocmVhZFN0YXJ0dXBEYXRhOjpXb3JrZXJUaHJlYWRTdGFydHVwRGF0YShjb25zdCBX b3JrZXJQYXJhbWV0ZXJzJiBvdGhlciwKIH0KIAogV29ya2VyVGhyZWFkOjpXb3JrZXJUaHJlYWQo Y29uc3QgV29ya2VyUGFyYW1ldGVycyYgcGFyYW1zLCBjb25zdCBTY3JpcHRCdWZmZXImIHNvdXJj ZUNvZGUsIFdvcmtlckxvYWRlclByb3h5JiB3b3JrZXJMb2FkZXJQcm94eSwgV29ya2VyRGVidWdn ZXJQcm94eSYgd29ya2VyRGVidWdnZXJQcm94eSwgV29ya2VyUmVwb3J0aW5nUHJveHkmIHdvcmtl clJlcG9ydGluZ1Byb3h5LCBXb3JrZXJUaHJlYWRTdGFydE1vZGUgc3RhcnRNb2RlLCBjb25zdCBT ZWN1cml0eU9yaWdpbiYgdG9wT3JpZ2luLCBJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Qcm94eSog Y29ubmVjdGlvblByb3h5LCBTb2NrZXRQcm92aWRlciogc29ja2V0UHJvdmlkZXIsIEpTQzo6UnVu dGltZUZsYWdzIHJ1bnRpbWVGbGFncykKLSAgICA6IFdvcmtlck9yV29ya2xldFRocmVhZChwYXJh bXMuaWRlbnRpZmllci5pc29sYXRlZENvcHkoKSwgcGFyYW1zLndvcmtlclRocmVhZE1vZGUpCisg ICAgOiBXb3JrZXJPcldvcmtsZXRUaHJlYWQocGFyYW1zLmluc3BlY3RvcklkZW50aWZpZXIuaXNv bGF0ZWRDb3B5KCksIHBhcmFtcy53b3JrZXJUaHJlYWRNb2RlKQogICAgICwgbV93b3JrZXJMb2Fk ZXJQcm94eSh3b3JrZXJMb2FkZXJQcm94eSkKICAgICAsIG1fd29ya2VyRGVidWdnZXJQcm94eSh3 b3JrZXJEZWJ1Z2dlclByb3h5KQogICAgICwgbV93b3JrZXJSZXBvcnRpbmdQcm94eSh3b3JrZXJS ZXBvcnRpbmdQcm94eSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy VGhyZWFkLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5oCmluZGV4IGI0 MzUwYzQ3YWZmODM4MTI2N2E5ZjZmOTgyNzA5YTM3YmIzN2MyYWIuLmRiYmZhMjRlOGIyYzM1M2Iy ZDYzMjA0OTRiMmNmOGZiODBiMTdjYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvV29ya2VyVGhyZWFkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJUaHJl YWQuaApAQCAtNjEsNyArNjEsNyBAQCBzdHJ1Y3QgV29ya2VyUGFyYW1ldGVycyB7CiBwdWJsaWM6 CiAgICAgVVJMIHNjcmlwdFVSTDsKICAgICBTdHJpbmcgbmFtZTsKLSAgICBTdHJpbmcgaWRlbnRp ZmllcjsKKyAgICBTdHJpbmcgaW5zcGVjdG9ySWRlbnRpZmllcjsKICAgICBTdHJpbmcgdXNlckFn ZW50OwogICAgIGJvb2wgaXNPbmxpbmU7CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9u c2VIZWFkZXJzIGNvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVyczsK