210267 2020-04-09 05:35:46 -0700 ProxyObject::defineOwnProperty() should conditionally throw on falsy trap result 2020-09-29 12:44:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Trivial --- 1 ashvayka ashvayka ews-watchlist keith_miller mark.lam msaboff nisl_grammarly1 ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1639588 0 ashvayka 2020-04-09 05:35:46 -0700 Test case: Object.defineProperty(new Proxy({}, {defineProperty: () => false}), "foo", {}) Expected: TypeError thrown Actual: Proxy object returned ECMA262: https://tc39.es/ecma262/#sec-object.defineproperty (step 4) Test262: https://test262.report/browse/built-ins/Proxy/defineProperty/trap-is-undefined-target-is-proxy.js 1639611 1 395945 ashvayka 2020-04-09 06:50:50 -0700 Created attachment 395945 Patch 1639652 2 395952 ashvayka 2020-04-09 08:22:51 -0700 Created attachment 395952 Patch Add spec link to ChangeLog. 1639657 3 395956 ashvayka 2020-04-09 08:30:41 -0700 Created attachment 395956 Patch Rebase patch. 1639740 4 395956 ross.kirsling 2020-04-09 11:20:32 -0700 Comment on attachment 395956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395956&action=review r=me with comment > Source/JavaScriptCore/ChangeLog:12 > + Also replaces 2 recently added throwTypeError() calls with throwVMTypeError(), > + as the latter seems to be preferred in ProxyObject. Seems like we should go the other way if we're not using the result, since throwVMTypeError just encodes the JSValue. 1639786 5 395990 ashvayka 2020-04-09 12:37:15 -0700 Created attachment 395990 Patch Set reviewer and replace throwVMTypeError() with unused results. 1639839 6 ews-feeder 2020-04-09 13:40:43 -0700 Committed r259822: <https://trac.webkit.org/changeset/259822> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395990. 1639840 7 webkit-bug-importer 2020-04-09 13:41:19 -0700 <rdar://problem/61537090> 1693093 8 ashvayka 2020-09-29 12:44:16 -0700 *** Bug 217051 has been marked as a duplicate of this bug. *** 395945 2020-04-09 06:50:50 -0700 2020-04-09 08:22:46 -0700 Patch bug-210267-20200409165048.patch text/plain 5085 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ODQwNzQ4NTdkNTNmYThlMThjNWUyNGM2NzE1Zjc2YmU0NmJkYmFjLi43NmYzOTJiNjk0YWUzNWQx ZWJkOGNhMmVmMmQ5Njk2Y2Q0YjU2ZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFp bC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KCkgc2hvdWxk IGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJhcCByZXN1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI2NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgY29uZGl0 aW9uYWwgVHlwZUVycm9yIGZvciBmYWxzeSB0cmFwIHJlc3VsdCwgbGlrZSB0aGVyZSBpcyBpbgor ICAgICAgICBQcm94eU9iamVjdDo6cGVyZm9ybVB1dCgpLCBhbGlnbmluZyBKU0Mgd2l0aCBWOCBh bmQgU3BpZGVyTW9ua2V5LgorCisgICAgICAgIEFsc28gcmVwbGFjZXMgMiByZWNlbnRseSBhZGRl ZCB0aHJvd1R5cGVFcnJvcigpIGNhbGxzIHdpdGggdGhyb3dWTVR5cGVFcnJvcigpLAorICAgICAg ICBhcyB0aGUgbGF0dGVyIHNlZW1zIHRvIGJlIHByZWZlcnJlZCBpbiBQcm94eU9iamVjdC4KKwor ICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpQcm94eU9i amVjdDo6cGVyZm9ybURlZmluZU93blByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6UHJveHlPYmpl Y3Q6OnBlcmZvcm1HZXRPd25Qcm9wZXJ0eU5hbWVzKToKKwogMjAyMC0wNC0wOCAgUm9zcyBLaXJz bGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEVOQUJMRV9J TlRMIGRlZmluZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJv eHlPYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3Qu Y3BwCmluZGV4IDZkMTFiNDFiYTQwNjE4MTU1MjJkYWIzZWJmZTMxYzc3NmU3ZWU3NzMuLjljN2Nl OTAyZjcyZmYxYmI0NzYzY2MzNTE0OGJhMTU0NjIxZTE5NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAKQEAgLTg2NSw4ICs4NjUsMTEgQEAgYm9v bCBQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93blByb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBn bG9iYWxPYmplY3QsIFByb3BlcnQKICAgICBib29sIHRyYXBSZXN1bHRBc0Jvb2wgPSB0cmFwUmVz dWx0LnRvQm9vbGVhbihnbG9iYWxPYmplY3QpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIGZhbHNlKTsKIAotICAgIGlmICghdHJhcFJlc3VsdEFzQm9vbCkKKyAgICBpZiAoIXRyYXBS ZXN1bHRBc0Jvb2wpIHsKKyAgICAgICAgaWYgKHNob3VsZFRocm93KQorICAgICAgICAgICAgdGhy b3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCBtYWtlU3RyaW5nKCJQcm94eSdzICdk ZWZpbmVQcm9wZXJ0eScgdHJhcCByZXR1cm5lZCBmYWxzeSB2YWx1ZSBmb3IgcHJvcGVydHkgJyIs IFN0cmluZyhwcm9wZXJ0eU5hbWUudWlkKCkpLCAiJyIpKTsKICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIH0KIAogICAgIFByb3BlcnR5RGVzY3JpcHRvciB0YXJnZXREZXNjcmlwdG9yOwogICAg IGJvb2wgaXNUYXJnZXREZXNjcmlwdG9yRGVmaW5lZCA9IHRhcmdldC0+Z2V0T3duUHJvcGVydHlE ZXNjcmlwdG9yKGdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCB0YXJnZXREZXNjcmlwdG9yKTsK QEAgLTkwNSw3ICs5MDgsNyBAQCBib29sIFByb3h5T2JqZWN0OjpwZXJmb3JtRGVmaW5lT3duUHJv cGVydHkoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydAogICAgIH0KICAgICBp ZiAodGFyZ2V0RGVzY3JpcHRvci5pc0RhdGFEZXNjcmlwdG9yKCkgJiYgIXRhcmdldERlc2NyaXB0 b3IuY29uZmlndXJhYmxlKCkgJiYgdGFyZ2V0RGVzY3JpcHRvci53cml0YWJsZSgpKSB7CiAgICAg ICAgIGlmIChkZXNjcmlwdG9yLndyaXRhYmxlUHJlc2VudCgpICYmICFkZXNjcmlwdG9yLndyaXRh YmxlKCkpIHsKLSAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUs ICJQcm94eSdzICdkZWZpbmVQcm9wZXJ0eScgdHJhcCByZXR1cm5lZCB0cnVlIGZvciBhIG5vbi13 cml0YWJsZSBpbnB1dCBkZXNjcmlwdG9yIHdoZW4gdGhlIHRhcmdldCdzIHByb3BlcnR5IGlzIG5v bi1jb25maWd1cmFibGUgYW5kIHdyaXRhYmxlIl9zKTsKKyAgICAgICAgICAgIHRocm93Vk1UeXBl RXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFw IHJldHVybmVkIHRydWUgZm9yIGEgbm9uLXdyaXRhYmxlIGlucHV0IGRlc2NyaXB0b3Igd2hlbiB0 aGUgdGFyZ2V0J3MgcHJvcGVydHkgaXMgbm9uLWNvbmZpZ3VyYWJsZSBhbmQgd3JpdGFibGUiX3Mp OwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgfQpAQCAtOTc4LDcg Kzk4MSw3IEBAIHZvaWQgUHJveHlPYmplY3Q6OnBlcmZvcm1HZXRPd25Qcm9wZXJ0eU5hbWVzKEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlCiAgICAgICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHNjb3BlLCBkb0V4aXRFYXJseSk7CiAKICAgICAgICAgICAgIGlmICghdW5jaGVj a2VkUmVzdWx0S2V5cy5hZGQoaWRlbnQuaW1wbCgpKS5pc05ld0VudHJ5KSB7Ci0gICAgICAgICAg ICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5IGhhbmRsZXIn cyAnb3duS2V5cycgdHJhcCByZXN1bHQgbXVzdCBub3QgY29udGFpbiBhbnkgZHVwbGljYXRlIG5h bWVzIl9zKTsKKyAgICAgICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwg c2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ293bktleXMnIHRyYXAgcmVzdWx0IG11c3Qgbm90IGNv bnRhaW4gYW55IGR1cGxpY2F0ZSBuYW1lcyJfcyk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGRv RXhpdEVhcmx5OwogICAgICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxv ZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYyMGQ2MzYzYmEzYjNkMTc4ZWYzZTA1NTY3ZGM4 ZGM1ZGE3ZGQwNjMuLjk2NTdlN2E2YjdiYWRjOWI0ZjA4MGQ4Nzc2NWYxNTExMTg4YTNmZmEgMTAw NjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTIgQEAKKzIwMjAtMDQtMDkgIEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21h aWwuY29tPgorCisgICAgICAgIFByb3h5T2JqZWN0OjpkZWZpbmVPd25Qcm9wZXJ0eSgpIHNob3Vs ZCBjb25kaXRpb25hbGx5IHRocm93IG9uIGZhbHN5IHRyYXAgcmVzdWx0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyNjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3QyNjIvZXhwZWN0YXRpb25z LnlhbWw6IE1hcmsgMiB0ZXN0IGNhc2VzIGFzIHBhc3NpbmcuCisKIDIwMjAtMDQtMDggIFl1c3Vr ZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBNdWx0aURlbGV0 ZUJ5T2Zmc2V0IHNob3VsZCB0ZWxsIGNvcnJlY3QgcmVzdWx0IEFic3RyYWN0VmFsdWUgaW4gQUkK ZGlmZiAtLWdpdCBhL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbCBiL0pTVGVzdHMv dGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAppbmRleCBlNmM3MzgyZTkxZjZmODZmNzM3OWI2MzNl ZmI2ODg0YjY0MTY5YzgyLi43YmU1Yjg1NWYzYWQ3MDQ4YzJlZGU2ZTI5ZWU0YTdmZTYzOTYwYjE4 IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKKysrIGIvSlNU ZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCkBAIC0xMjUyLDkgKzEyNTIsNiBAQCB0ZXN0 L2J1aWx0LWlucy9Qcm94eS9jcmVhdGUtdGFyZ2V0LWlzLXJldm9rZWQtZnVuY3Rpb24tcHJveHku anM6CiB0ZXN0L2J1aWx0LWlucy9Qcm94eS9jcmVhdGUtdGFyZ2V0LWlzLXJldm9rZWQtcHJveHku anM6CiAgIGRlZmF1bHQ6ICJUeXBlRXJyb3I6IEEgUHJveHkncyAndGFyZ2V0JyBzaG91bGRuJ3Qg YmUgYSByZXZva2VkIFByb3h5IgogICBzdHJpY3QgbW9kZTogIlR5cGVFcnJvcjogQSBQcm94eSdz ICd0YXJnZXQnIHNob3VsZG4ndCBiZSBhIHJldm9rZWQgUHJveHkiCi10ZXN0L2J1aWx0LWlucy9Q cm94eS9kZWZpbmVQcm9wZXJ0eS90cmFwLWlzLXVuZGVmaW5lZC10YXJnZXQtaXMtcHJveHkuanM6 Ci0gIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRo cm93biBidXQgbm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTog J1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBl eGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCiB0ZXN0L2J1aWx0LWlucy9Qcm94eS9nZXRPd25Q cm9wZXJ0eURlc2NyaXB0b3IvdHJhcC1pcy1taXNzaW5nLXRhcmdldC1pcy1wcm94eS5qczoKICAg ZGVmYXVsdDogIlR5cGVFcnJvcjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRp bmcgJ29yaWdpbmFsRGVzYy5lbnVtZXJhYmxlJykiCiAgIHN0cmljdCBtb2RlOiAiVHlwZUVycm9y OiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAnb3JpZ2luYWxEZXNjLmVu dW1lcmFibGUnKSIK 395952 2020-04-09 08:22:51 -0700 2020-04-09 08:30:37 -0700 Patch bug-210267-20200409182249.patch text/plain 5165 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ODQwNzQ4NTdkNTNmYThlMThjNWUyNGM2NzE1Zjc2YmU0NmJkYmFjLi40NjRjZjg0MWNjN2E4YjAw Y2Y1YmNmNzJmNzcxMTk0ODFhYjE0MGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFp bC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KCkgc2hvdWxk IGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJhcCByZXN1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI2NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgY29uZGl0 aW9uYWwgVHlwZUVycm9yIGZvciBmYWxzeSB0cmFwIHJlc3VsdCBbMV0sIGxpa2UgdGhlcmUgaXMK KyAgICAgICAgaW4gUHJveHlPYmplY3Q6OnBlcmZvcm1QdXQoKSwgYWxpZ25pbmcgSlNDIHdpdGgg VjggYW5kIFNwaWRlck1vbmtleS4KKworICAgICAgICBBbHNvIHJlcGxhY2VzIDIgcmVjZW50bHkg YWRkZWQgdGhyb3dUeXBlRXJyb3IoKSBjYWxscyB3aXRoIHRocm93Vk1UeXBlRXJyb3IoKSwKKyAg ICAgICAgYXMgdGhlIGxhdHRlciBzZWVtcyB0byBiZSBwcmVmZXJyZWQgaW4gUHJveHlPYmplY3Qu CisKKyAgICAgICAgWzFdOiBodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLWRlZmluZXByb3Bl cnR5b3J0aHJvdyAoc3RlcCA0KQorCisgICAgICAgICogcnVudGltZS9Qcm94eU9iamVjdC5jcHA6 CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJmb3JtRGVmaW5lT3duUHJvcGVydHkpOgor ICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TmFtZXMpOgor CiAyMDIwLTA0LTA4ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAog ICAgICAgICBSZW1vdmUgRU5BQkxFX0lOVEwgZGVmaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAKaW5kZXggNmQxMWI0MWJhNDA2MTgxNTUyMmRhYjNl YmZlMzFjNzc2ZTdlZTc3My4uOWM3Y2U5MDJmNzJmZjFiYjQ3NjNjYzM1MTQ4YmExNTQ2MjFlMTk0 ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcApA QCAtODY1LDggKzg2NSwxMSBAQCBib29sIFByb3h5T2JqZWN0OjpwZXJmb3JtRGVmaW5lT3duUHJv cGVydHkoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydAogICAgIGJvb2wgdHJh cFJlc3VsdEFzQm9vbCA9IHRyYXBSZXN1bHQudG9Cb29sZWFuKGdsb2JhbE9iamVjdCk7CiAgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogCi0gICAgaWYgKCF0cmFwUmVzdWx0 QXNCb29sKQorICAgIGlmICghdHJhcFJlc3VsdEFzQm9vbCkgeworICAgICAgICBpZiAoc2hvdWxk VGhyb3cpCisgICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUs IG1ha2VTdHJpbmcoIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIHJldHVybmVkIGZhbHN5 IHZhbHVlIGZvciBwcm9wZXJ0eSAnIiwgU3RyaW5nKHByb3BlcnR5TmFtZS51aWQoKSksICInIikp OwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgUHJvcGVydHlEZXNjcmlwdG9y IHRhcmdldERlc2NyaXB0b3I7CiAgICAgYm9vbCBpc1RhcmdldERlc2NyaXB0b3JEZWZpbmVkID0g dGFyZ2V0LT5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5h bWUsIHRhcmdldERlc2NyaXB0b3IpOwpAQCAtOTA1LDcgKzkwOCw3IEBAIGJvb2wgUHJveHlPYmpl Y3Q6OnBlcmZvcm1EZWZpbmVPd25Qcm9wZXJ0eShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 LCBQcm9wZXJ0CiAgICAgfQogICAgIGlmICh0YXJnZXREZXNjcmlwdG9yLmlzRGF0YURlc2NyaXB0 b3IoKSAmJiAhdGFyZ2V0RGVzY3JpcHRvci5jb25maWd1cmFibGUoKSAmJiB0YXJnZXREZXNjcmlw dG9yLndyaXRhYmxlKCkpIHsKICAgICAgICAgaWYgKGRlc2NyaXB0b3Iud3JpdGFibGVQcmVzZW50 KCkgJiYgIWRlc2NyaXB0b3Iud3JpdGFibGUoKSkgewotICAgICAgICAgICAgdGhyb3dUeXBlRXJy b3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIHJl dHVybmVkIHRydWUgZm9yIGEgbm9uLXdyaXRhYmxlIGlucHV0IGRlc2NyaXB0b3Igd2hlbiB0aGUg dGFyZ2V0J3MgcHJvcGVydHkgaXMgbm9uLWNvbmZpZ3VyYWJsZSBhbmQgd3JpdGFibGUiX3MpOwor ICAgICAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkn cyAnZGVmaW5lUHJvcGVydHknIHRyYXAgcmV0dXJuZWQgdHJ1ZSBmb3IgYSBub24td3JpdGFibGUg aW5wdXQgZGVzY3JpcHRvciB3aGVuIHRoZSB0YXJnZXQncyBwcm9wZXJ0eSBpcyBub24tY29uZmln dXJhYmxlIGFuZCB3cml0YWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KICAgICB9CkBAIC05NzgsNyArOTgxLDcgQEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9y bUdldE93blByb3BlcnR5TmFtZXMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGUK ICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGRvRXhpdEVhcmx5KTsKIAog ICAgICAgICAgICAgaWYgKCF1bmNoZWNrZWRSZXN1bHRLZXlzLmFkZChpZGVudC5pbXBsKCkpLmlz TmV3RW50cnkpIHsKLSAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3Qs IHNjb3BlLCAiUHJveHkgaGFuZGxlcidzICdvd25LZXlzJyB0cmFwIHJlc3VsdCBtdXN0IG5vdCBj b250YWluIGFueSBkdXBsaWNhdGUgbmFtZXMiX3MpOworICAgICAgICAgICAgICAgIHRocm93Vk1U eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5IGhhbmRsZXIncyAnb3duS2V5cycg dHJhcCByZXN1bHQgbXVzdCBub3QgY29udGFpbiBhbnkgZHVwbGljYXRlIG5hbWVzIl9zKTsKICAg ICAgICAgICAgICAgICByZXR1cm4gZG9FeGl0RWFybHk7CiAgICAgICAgICAgICB9CiAKZGlmZiAt LWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjIwZDYz NjNiYTNiM2QxNzhlZjNlMDU1NjdkYzhkYzVkYTdkZDA2My4uOTY1N2U3YTZiN2JhZGM5YjRmMDgw ZDg3NzY1ZjE1MTExODhhM2ZmYSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIv SlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNo dmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRl ZmluZU93blByb3BlcnR5KCkgc2hvdWxkIGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJh cCByZXN1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDI2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbDogTWFyayAyIHRlc3QgY2FzZXMgYXMgcGFzc2lu Zy4KKwogMjAyMC0wNC0wOCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAg ICAgICAgIFtKU0NdIE11bHRpRGVsZXRlQnlPZmZzZXQgc2hvdWxkIHRlbGwgY29ycmVjdCByZXN1 bHQgQWJzdHJhY3RWYWx1ZSBpbiBBSQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy90ZXN0MjYyL2V4cGVj dGF0aW9ucy55YW1sIGIvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCmluZGV4IGU2 YzczODJlOTFmNmY4NmY3Mzc5YjYzM2VmYjY4ODRiNjQxNjljODIuLjdiZTViODU1ZjNhZDcwNDhj MmVkZTZlMjllZTRhN2ZlNjM5NjBiMTggMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvdGVzdDI2Mi9leHBl Y3RhdGlvbnMueWFtbAorKysgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKQEAg LTEyNTIsOSArMTI1Miw2IEBAIHRlc3QvYnVpbHQtaW5zL1Byb3h5L2NyZWF0ZS10YXJnZXQtaXMt cmV2b2tlZC1mdW5jdGlvbi1wcm94eS5qczoKIHRlc3QvYnVpbHQtaW5zL1Byb3h5L2NyZWF0ZS10 YXJnZXQtaXMtcmV2b2tlZC1wcm94eS5qczoKICAgZGVmYXVsdDogIlR5cGVFcnJvcjogQSBQcm94 eSdzICd0YXJnZXQnIHNob3VsZG4ndCBiZSBhIHJldm9rZWQgUHJveHkiCiAgIHN0cmljdCBtb2Rl OiAiVHlwZUVycm9yOiBBIFByb3h5J3MgJ3RhcmdldCcgc2hvdWxkbid0IGJlIGEgcmV2b2tlZCBQ cm94eSIKLXRlc3QvYnVpbHQtaW5zL1Byb3h5L2RlZmluZVByb3BlcnR5L3RyYXAtaXMtdW5kZWZp bmVkLXRhcmdldC1pcy1wcm94eS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0 ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBh dCBhbGwnCi0gIHN0cmljdCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJv ciB0byBiZSB0aHJvd24gYnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKIHRlc3Qv YnVpbHQtaW5zL1Byb3h5L2dldE93blByb3BlcnR5RGVzY3JpcHRvci90cmFwLWlzLW1pc3Npbmct dGFyZ2V0LWlzLXByb3h5LmpzOgogICBkZWZhdWx0OiAiVHlwZUVycm9yOiB1bmRlZmluZWQgaXMg bm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAnb3JpZ2luYWxEZXNjLmVudW1lcmFibGUnKSIKICAg c3RyaWN0IG1vZGU6ICJUeXBlRXJyb3I6IHVuZGVmaW5lZCBpcyBub3QgYW4gb2JqZWN0IChldmFs dWF0aW5nICdvcmlnaW5hbERlc2MuZW51bWVyYWJsZScpIgo= 395956 2020-04-09 08:30:41 -0700 2020-04-09 12:37:10 -0700 Patch bug-210267-20200409183039.patch text/plain 5256 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5ODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OTJlNTIwOGI2ZGQ2N2U0ZTc1NWViOTZjM2Y1ZTFmOWU2N2EzMWZhLi4xYWUyNjYzNmQ3MDE5ZmU3 Njc5ZmVmMDIwNGUzZWU5MmIzZTc2OWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFp bC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KCkgc2hvdWxk IGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJhcCByZXN1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI2NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFkZHMgY29uZGl0 aW9uYWwgVHlwZUVycm9yIGZvciBmYWxzeSB0cmFwIHJlc3VsdCBbMV0sIGxpa2UgdGhlcmUgaXMK KyAgICAgICAgaW4gUHJveHlPYmplY3Q6OnBlcmZvcm1QdXQoKSwgYWxpZ25pbmcgSlNDIHdpdGgg VjggYW5kIFNwaWRlck1vbmtleS4KKworICAgICAgICBBbHNvIHJlcGxhY2VzIDIgcmVjZW50bHkg YWRkZWQgdGhyb3dUeXBlRXJyb3IoKSBjYWxscyB3aXRoIHRocm93Vk1UeXBlRXJyb3IoKSwKKyAg ICAgICAgYXMgdGhlIGxhdHRlciBzZWVtcyB0byBiZSBwcmVmZXJyZWQgaW4gUHJveHlPYmplY3Qu CisKKyAgICAgICAgWzFdOiBodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLWRlZmluZXByb3Bl cnR5b3J0aHJvdyAoc3RlcCA0KQorCisgICAgICAgICogcnVudGltZS9Qcm94eU9iamVjdC5jcHA6 CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJmb3JtRGVmaW5lT3duUHJvcGVydHkpOgor ICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TmFtZXMpOgor CiAyMDIwLTA0LTA5ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAog ICAgICAgICBnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoKSBpcyBpbmNvcnJlY3Qgd2l0aCBQcm94 eSBvZiBleG90aWMgb2JqZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9Qcm94eU9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94 eU9iamVjdC5jcHAKaW5kZXggNmQxMWI0MWJhNDA2MTgxNTUyMmRhYjNlYmZlMzFjNzc2ZTdlZTc3 My4uOWM3Y2U5MDJmNzJmZjFiYjQ3NjNjYzM1MTQ4YmExNTQ2MjFlMTk0ZSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcApAQCAtODY1LDggKzg2NSwx MSBAQCBib29sIFByb3h5T2JqZWN0OjpwZXJmb3JtRGVmaW5lT3duUHJvcGVydHkoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGVydAogICAgIGJvb2wgdHJhcFJlc3VsdEFzQm9vbCA9 IHRyYXBSZXN1bHQudG9Cb29sZWFuKGdsb2JhbE9iamVjdCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZmFsc2UpOwogCi0gICAgaWYgKCF0cmFwUmVzdWx0QXNCb29sKQorICAgIGlm ICghdHJhcFJlc3VsdEFzQm9vbCkgeworICAgICAgICBpZiAoc2hvdWxkVGhyb3cpCisgICAgICAg ICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIG1ha2VTdHJpbmcoIlBy b3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIHJldHVybmVkIGZhbHN5IHZhbHVlIGZvciBwcm9w ZXJ0eSAnIiwgU3RyaW5nKHByb3BlcnR5TmFtZS51aWQoKSksICInIikpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQogCiAgICAgUHJvcGVydHlEZXNjcmlwdG9yIHRhcmdldERlc2NyaXB0 b3I7CiAgICAgYm9vbCBpc1RhcmdldERlc2NyaXB0b3JEZWZpbmVkID0gdGFyZ2V0LT5nZXRPd25Q cm9wZXJ0eURlc2NyaXB0b3IoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHRhcmdldERlc2Ny aXB0b3IpOwpAQCAtOTA1LDcgKzkwOCw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1EZWZp bmVPd25Qcm9wZXJ0eShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0CiAgICAg fQogICAgIGlmICh0YXJnZXREZXNjcmlwdG9yLmlzRGF0YURlc2NyaXB0b3IoKSAmJiAhdGFyZ2V0 RGVzY3JpcHRvci5jb25maWd1cmFibGUoKSAmJiB0YXJnZXREZXNjcmlwdG9yLndyaXRhYmxlKCkp IHsKICAgICAgICAgaWYgKGRlc2NyaXB0b3Iud3JpdGFibGVQcmVzZW50KCkgJiYgIWRlc2NyaXB0 b3Iud3JpdGFibGUoKSkgewotICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0 LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIHJldHVybmVkIHRydWUgZm9y IGEgbm9uLXdyaXRhYmxlIGlucHV0IGRlc2NyaXB0b3Igd2hlbiB0aGUgdGFyZ2V0J3MgcHJvcGVy dHkgaXMgbm9uLWNvbmZpZ3VyYWJsZSBhbmQgd3JpdGFibGUiX3MpOworICAgICAgICAgICAgdGhy b3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkncyAnZGVmaW5lUHJvcGVy dHknIHRyYXAgcmV0dXJuZWQgdHJ1ZSBmb3IgYSBub24td3JpdGFibGUgaW5wdXQgZGVzY3JpcHRv ciB3aGVuIHRoZSB0YXJnZXQncyBwcm9wZXJ0eSBpcyBub24tY29uZmlndXJhYmxlIGFuZCB3cml0 YWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CkBA IC05NzgsNyArOTgxLDcgQEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5 TmFtZXMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGUKICAgICAgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGRvRXhpdEVhcmx5KTsKIAogICAgICAgICAgICAgaWYg KCF1bmNoZWNrZWRSZXN1bHRLZXlzLmFkZChpZGVudC5pbXBsKCkpLmlzTmV3RW50cnkpIHsKLSAg ICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkg aGFuZGxlcidzICdvd25LZXlzJyB0cmFwIHJlc3VsdCBtdXN0IG5vdCBjb250YWluIGFueSBkdXBs aWNhdGUgbmFtZXMiX3MpOworICAgICAgICAgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFs T2JqZWN0LCBzY29wZSwgIlByb3h5IGhhbmRsZXIncyAnb3duS2V5cycgdHJhcCByZXN1bHQgbXVz dCBub3QgY29udGFpbiBhbnkgZHVwbGljYXRlIG5hbWVzIl9zKTsKICAgICAgICAgICAgICAgICBy ZXR1cm4gZG9FeGl0RWFybHk7CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL0pTVGVzdHMv Q2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDZkODg1ZDQ4OWUzNzBhMjRlMzVm MDBlYWY1MWQxYmNlNGU1NzFjOC4uNWMzODcyYzc5OWNjNTIzZmQ3MTYwNTIxNjRhNGFjZGFkM2Vh YTMzOSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWth bGVzaEBnbWFpbC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRlZmluZU93blByb3BlcnR5 KCkgc2hvdWxkIGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJhcCByZXN1bHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI2NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdDI2Mi9leHBl Y3RhdGlvbnMueWFtbDogTWFyayAyIHRlc3QgY2FzZXMgYXMgcGFzc2luZy4KKwogMjAyMC0wNC0w OSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CiAKICAgICAgICAgZ2V0 T3duUHJvcGVydHlEZXNjcmlwdG9yKCkgaXMgaW5jb3JyZWN0IHdpdGggUHJveHkgb2YgZXhvdGlj IG9iamVjdApkaWZmIC0tZ2l0IGEvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sIGIv SlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCmluZGV4IDdiZDdkN2Y4OTZlZjgyYmMz YjA4NzlmMTMwNWFjNjA4MDJkNjY3YjIuLjk0YmNmZDcyYzNjYzIxOGVjM2Q2N2ViZGEyYjg0MGM4 ZGQwZDUzY2MgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAor KysgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKQEAgLTEyNDksOSArMTI0OSw2 IEBAIHRlc3QvYnVpbHQtaW5zL1Byb3h5L2NyZWF0ZS10YXJnZXQtaXMtcmV2b2tlZC1mdW5jdGlv bi1wcm94eS5qczoKIHRlc3QvYnVpbHQtaW5zL1Byb3h5L2NyZWF0ZS10YXJnZXQtaXMtcmV2b2tl ZC1wcm94eS5qczoKICAgZGVmYXVsdDogIlR5cGVFcnJvcjogQSBQcm94eSdzICd0YXJnZXQnIHNo b3VsZG4ndCBiZSBhIHJldm9rZWQgUHJveHkiCiAgIHN0cmljdCBtb2RlOiAiVHlwZUVycm9yOiBB IFByb3h5J3MgJ3RhcmdldCcgc2hvdWxkbid0IGJlIGEgcmV2b2tlZCBQcm94eSIKLXRlc3QvYnVp bHQtaW5zL1Byb3h5L2RlZmluZVByb3BlcnR5L3RyYXAtaXMtdW5kZWZpbmVkLXRhcmdldC1pcy1w cm94eS5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3Ig dG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24gd2FzIHRocm93biBhdCBhbGwnCi0gIHN0cmlj dCBtb2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBhIFR5cGVFcnJvciB0byBiZSB0aHJvd24g YnV0IG5vIGV4Y2VwdGlvbiB3YXMgdGhyb3duIGF0IGFsbCcKIHRlc3QvYnVpbHQtaW5zL1Byb3h5 L293bktleXMvdHJhcC1pcy11bmRlZmluZWQtdGFyZ2V0LWlzLXByb3h5LmpzOgogICBkZWZhdWx0 OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBbbGVuZ3RoLCBmb28sIDAsIFN5bWJvbCgpXSBhbmQg W1N5bWJvbCgpLCBsZW5ndGgsIGZvbywgMF0gdG8gaGF2ZSB0aGUgc2FtZSBjb250ZW50cy4gJwog ICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgW2xlbmd0aCwgZm9vLCAwLCBT eW1ib2woKV0gYW5kIFtTeW1ib2woKSwgbGVuZ3RoLCBmb28sIDBdIHRvIGhhdmUgdGhlIHNhbWUg Y29udGVudHMuICcK 395990 2020-04-09 12:37:15 -0700 2020-04-09 13:40:44 -0700 Patch bug-210267-20200409223713.patch text/plain 23194 ashvayka U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5ODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OTJlNTIwOGI2ZGQ2N2U0ZTc1NWViOTZjM2Y1ZTFmOWU2N2EzMWZhLi43ZmQyZDY4YWY4ZmQ5OGQ3 MDE5MDc4Nzg3ZTFkYWYxYTI1ZGQzZmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0wNC0wOSAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWthbGVzaEBnbWFp bC5jb20+CisKKyAgICAgICAgUHJveHlPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KCkgc2hvdWxk IGNvbmRpdGlvbmFsbHkgdGhyb3cgb24gZmFsc3kgdHJhcCByZXN1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI2NworCisgICAgICAgIFJldmll d2VkIGJ5IFJvc3MgS2lyc2xpbmcuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWRkcyBjb25kaXRp b25hbCBUeXBlRXJyb3IgZm9yIGZhbHN5IHRyYXAgcmVzdWx0IFsxXSwgbGlrZSB0aGVyZSBpcyBp bgorICAgICAgICBQcm94eU9iamVjdDo6cGVyZm9ybVB1dCgpLCBhbGlnbmluZyBKU0Mgd2l0aCBW OCBhbmQgU3BpZGVyTW9ua2V5LiBBbHNvIHJlcGxhY2VzCisgICAgICAgIHRocm93Vk1UeXBlRXJy b3IoKSBjYWxscyB3aGljaCByZXN1bHRzIGFyZSB1bnVzZWQgd2l0aCB0aHJvd1R5cGVFcnJvcigp LgorCisgICAgICAgIFsxXTogaHR0cHM6Ly90YzM5LmVzL2VjbWEyNjIvI3NlYy1kZWZpbmVwcm9w ZXJ0eW9ydGhyb3cgKHN0ZXAgNCkKKworICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmplY3QuY3Bw OgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93blByb3BlcnR5KQor CiAyMDIwLTA0LTA5ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAog ICAgICAgICBnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoKSBpcyBpbmNvcnJlY3Qgd2l0aCBQcm94 eSBvZiBleG90aWMgb2JqZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9Qcm94eU9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94 eU9iamVjdC5jcHAKaW5kZXggNmQxMWI0MWJhNDA2MTgxNTUyMmRhYjNlYmZlMzFjNzc2ZTdlZTc3 My4uNTljZDNjZmM2NTQxMDQxOGQ3N2YxNmRlMzE2MzlmNzVmOGE0NTFjYSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcApAQCAtMjI2LDcgKzIyNiw3 IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1JbnRlcm5hbE1ldGhvZEdldE93blByb3BlcnR5 KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplCiAKICAgICBKU1ZhbHVlIGhhbmRsZXJWYWx1ZSA9 IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxlclZhbHVlLmlzTnVsbCgpKSB7Ci0gICAg ICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc19wcm94eUFscmVhZHlS ZXZva2VkRXJyb3JNZXNzYWdlKTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0 LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJyb3JNZXNzYWdlKTsKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KIApAQCAtMjQ2LDcgKzI0Niw3IEBAIGJvb2wgUHJveHlPYmplY3Q6 OnBlcmZvcm1JbnRlcm5hbE1ldGhvZEdldE93blByb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplCiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogCiAgICAgaWYg KCF0cmFwUmVzdWx0LmlzVW5kZWZpbmVkKCkgJiYgIXRyYXBSZXN1bHQuaXNPYmplY3QoKSkgewot ICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJyZXN1bHQgb2Yg J2dldE93blByb3BlcnR5RGVzY3JpcHRvcicgY2FsbCBzaG91bGQgZWl0aGVyIGJlIGFuIE9iamVj dCBvciB1bmRlZmluZWQiX3MpOworICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3Qs IHNjb3BlLCAicmVzdWx0IG9mICdnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3InIGNhbGwgc2hvdWxk IGVpdGhlciBiZSBhbiBPYmplY3Qgb3IgdW5kZWZpbmVkIl9zKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KIApAQCAtMjU4LDEzICsyNTgsMTMgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVy Zm9ybUludGVybmFsTWV0aG9kR2V0T3duUHJvcGVydHkoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amUKICAgICAgICAgaWYgKCFpc1RhcmdldFByb3BlcnR5RGVzY3JpcHRvckRlZmluZWQpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGlmICghdGFyZ2V0UHJvcGVydHlEZXNjcmlw dG9yLmNvbmZpZ3VyYWJsZSgpKSB7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2Jh bE9iamVjdCwgc2NvcGUsICJXaGVuIHRoZSByZXN1bHQgb2YgJ2dldE93blByb3BlcnR5RGVzY3Jp cHRvcicgaXMgdW5kZWZpbmVkIHRoZSB0YXJnZXQgbXVzdCBiZSBjb25maWd1cmFibGUiX3MpOwor ICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIldoZW4gdGhl IHJlc3VsdCBvZiAnZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yJyBpcyB1bmRlZmluZWQgdGhlIHRh cmdldCBtdXN0IGJlIGNvbmZpZ3VyYWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KICAgICAgICAgYm9vbCBpc0V4dGVuc2libGUgPSB0YXJnZXQtPmlzRXh0ZW5z aWJsZShnbG9iYWxPYmplY3QpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBm YWxzZSk7CiAgICAgICAgIGlmICghaXNFeHRlbnNpYmxlKSB7Ci0gICAgICAgICAgICB0aHJvd1ZN VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJXaGVuICdnZXRPd25Qcm9wZXJ0eURlc2Ny aXB0b3InIHJldHVybnMgdW5kZWZpbmVkLCB0aGUgJ3RhcmdldCcgb2YgYSBQcm94eSBzaG91bGQg YmUgZXh0ZW5zaWJsZSJfcyk7CisgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmpl Y3QsIHNjb3BlLCAiV2hlbiAnZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yJyByZXR1cm5zIHVuZGVm aW5lZCwgdGhlICd0YXJnZXQnIG9mIGEgUHJveHkgc2hvdWxkIGJlIGV4dGVuc2libGUiX3MpOwog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKQEAgLTI4MSwxNyArMjgxLDE3 IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1JbnRlcm5hbE1ldGhvZEdldE93blByb3BlcnR5 KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplCiAgICAgICAgIHRyYXBSZXN1bHRBc0Rlc2NyaXB0 b3IsIGlzVGFyZ2V0UHJvcGVydHlEZXNjcmlwdG9yRGVmaW5lZCwgdGFyZ2V0UHJvcGVydHlEZXNj cmlwdG9yLCB0aHJvd0V4Y2VwdGlvbik7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZmFsc2UpOwogICAgIGlmICghdmFsaWQpIHsKLSAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9i YWxPYmplY3QsIHNjb3BlLCAiUmVzdWx0IGZyb20gJ2dldE93blByb3BlcnR5RGVzY3JpcHRvcicg ZmFpbHMgdGhlIElzQ29tcGF0aWJsZVByb3BlcnR5RGVzY3JpcHRvciB0ZXN0Il9zKTsKKyAgICAg ICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlJlc3VsdCBmcm9tICdnZXRP d25Qcm9wZXJ0eURlc2NyaXB0b3InIGZhaWxzIHRoZSBJc0NvbXBhdGlibGVQcm9wZXJ0eURlc2Ny aXB0b3IgdGVzdCJfcyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBpZiAo IXRyYXBSZXN1bHRBc0Rlc2NyaXB0b3IuY29uZmlndXJhYmxlKCkpIHsKICAgICAgICAgaWYgKCFp c1RhcmdldFByb3BlcnR5RGVzY3JpcHRvckRlZmluZWQgfHwgdGFyZ2V0UHJvcGVydHlEZXNjcmlw dG9yLmNvbmZpZ3VyYWJsZSgpKSB7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2Jh bE9iamVjdCwgc2NvcGUsICJSZXN1bHQgZnJvbSAnZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yJyBj YW4ndCBiZSBub24tY29uZmlndXJhYmxlIHdoZW4gdGhlICd0YXJnZXQnIGRvZXNuJ3QgaGF2ZSBp dCBhcyBhbiBvd24gcHJvcGVydHkgb3IgaWYgaXQgaXMgYSBjb25maWd1cmFibGUgb3duIHByb3Bl cnR5IG9uICd0YXJnZXQnIl9zKTsKKyAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9i amVjdCwgc2NvcGUsICJSZXN1bHQgZnJvbSAnZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yJyBjYW4n dCBiZSBub24tY29uZmlndXJhYmxlIHdoZW4gdGhlICd0YXJnZXQnIGRvZXNuJ3QgaGF2ZSBpdCBh cyBhbiBvd24gcHJvcGVydHkgb3IgaWYgaXQgaXMgYSBjb25maWd1cmFibGUgb3duIHByb3BlcnR5 IG9uICd0YXJnZXQnIl9zKTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQog ICAgICAgICBpZiAodHJhcFJlc3VsdEFzRGVzY3JpcHRvci53cml0YWJsZVByZXNlbnQoKSAmJiAh dHJhcFJlc3VsdEFzRGVzY3JpcHRvci53cml0YWJsZSgpICYmIHRhcmdldFByb3BlcnR5RGVzY3Jp cHRvci53cml0YWJsZSgpKSB7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9i amVjdCwgc2NvcGUsICJSZXN1bHQgZnJvbSAnZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yJyBjYW4n dCBiZSBub24tY29uZmlndXJhYmxlIGFuZCBub24td3JpdGFibGUgd2hlbiB0aGUgdGFyZ2V0J3Mg cHJvcGVydHkgaXMgd3JpdGFibGUiX3MpOworICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xv YmFsT2JqZWN0LCBzY29wZSwgIlJlc3VsdCBmcm9tICdnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3In IGNhbid0IGJlIG5vbi1jb25maWd1cmFibGUgYW5kIG5vbi13cml0YWJsZSB3aGVuIHRoZSB0YXJn ZXQncyBwcm9wZXJ0eSBpcyB3cml0YWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KICAgICB9CkBAIC0zMzAsNyArMzMwLDcgQEAgYm9vbCBQcm94eU9iamVjdDo6 cGVyZm9ybUhhc1Byb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5 TmFtZQogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSB0aGlzLT5oYW5kbGVyKCk7CiAgICAg aWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewotICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGds b2JhbE9iamVjdCwgc2NvcGUsIHNfcHJveHlBbHJlYWR5UmV2b2tlZEVycm9yTWVzc2FnZSk7Cisg ICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNfcHJveHlBbHJlYWR5 UmV2b2tlZEVycm9yTWVzc2FnZSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAg LTM1OCwxMyArMzU4LDEzIEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1IYXNQcm9wZXJ0eShK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0eU5hbWUKICAgICAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICBpZiAoaXNQcm9wZXJ0eURlc2Ny aXB0b3JEZWZpbmVkKSB7CiAgICAgICAgICAgICBpZiAoIWRlc2NyaXB0b3IuY29uZmlndXJhYmxl KCkpIHsKLSAgICAgICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2Nv cGUsICJQcm94eSAnaGFzJyBtdXN0IHJldHVybiAndHJ1ZScgZm9yIG5vbi1jb25maWd1cmFibGUg cHJvcGVydGllcyJfcyk7CisgICAgICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2Jq ZWN0LCBzY29wZSwgIlByb3h5ICdoYXMnIG11c3QgcmV0dXJuICd0cnVlJyBmb3Igbm9uLWNvbmZp Z3VyYWJsZSBwcm9wZXJ0aWVzIl9zKTsKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICBib29sIGlzRXh0ZW5zaWJsZSA9IHRhcmdldC0+aXNF eHRlbnNpYmxlKGdsb2JhbE9iamVjdCk7CiAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBmYWxzZSk7CiAgICAgICAgICAgICBpZiAoIWlzRXh0ZW5zaWJsZSkgewotICAgICAg ICAgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5ICdo YXMnIG11c3QgcmV0dXJuICd0cnVlJyBmb3IgYSBub24tZXh0ZW5zaWJsZSAndGFyZ2V0JyBvYmpl Y3Qgd2l0aCBhIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0eSJfcyk7CisgICAgICAgICAgICAgICAgdGhy b3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5ICdoYXMnIG11c3QgcmV0dXJu ICd0cnVlJyBmb3IgYSBub24tZXh0ZW5zaWJsZSAndGFyZ2V0JyBvYmplY3Qgd2l0aCBhIGNvbmZp Z3VyYWJsZSBwcm9wZXJ0eSJfcyk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICAgICAgfQogICAgICAgICB9CkBAIC00MzMsNyArNDMzLDcgQEAgYm9vbCBQcm94eU9iamVj dDo6cGVyZm9ybVB1dChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHB1dFZh bHVlLCBKU1YKIAogICAgIEpTVmFsdWUgaGFuZGxlclZhbHVlID0gdGhpcy0+aGFuZGxlcigpOwog ICAgIGlmIChoYW5kbGVyVmFsdWUuaXNOdWxsKCkpIHsKLSAgICAgICAgdGhyb3dWTVR5cGVFcnJv cihnbG9iYWxPYmplY3QsIHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJldm9rZWRFcnJvck1lc3NhZ2Up OworICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCBzX3Byb3h5QWxy ZWFkeVJldm9rZWRFcnJvck1lc3NhZ2UpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog CkBAIC00NTgsNyArNDU4LDcgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybVB1dChKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHB1dFZhbHVlLCBKU1YKICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCBmYWxzZSk7CiAgICAgaWYgKCF0cmFwUmVzdWx0QXNCb29sKSB7 CiAgICAgICAgIGlmIChzaG91bGRUaHJvdykKLSAgICAgICAgICAgIHRocm93Vk1UeXBlRXJyb3Io Z2xvYmFsT2JqZWN0LCBzY29wZSwgbWFrZVN0cmluZygiUHJveHkgb2JqZWN0J3MgJ3NldCcgdHJh cCByZXR1cm5lZCBmYWxzeSB2YWx1ZSBmb3IgcHJvcGVydHkgJyIsIFN0cmluZyhwcm9wZXJ0eU5h bWUudWlkKCkpLCAiJyIpKTsKKyAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVj dCwgc2NvcGUsIG1ha2VTdHJpbmcoIlByb3h5IG9iamVjdCdzICdzZXQnIHRyYXAgcmV0dXJuZWQg ZmFsc3kgdmFsdWUgZm9yIHByb3BlcnR5ICciLCBTdHJpbmcocHJvcGVydHlOYW1lLnVpZCgpKSwg IiciKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTQ3MCwxMSArNDcwLDEx IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1QdXQoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCwgSlNWYWx1ZSBwdXRWYWx1ZSwgSlNWCiAgICAgICAgICAgICBib29sIGlzU2FtZSA9IHNh bWVWYWx1ZShnbG9iYWxPYmplY3QsIGRlc2NyaXB0b3IudmFsdWUoKSwgcHV0VmFsdWUpOwogICAg ICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICAgICAg aWYgKCFpc1NhbWUpIHsKLSAgICAgICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9i amVjdCwgc2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ3NldCcgb24gYSBub24tY29uZmlndXJhYmxl IGFuZCBub24td3JpdGFibGUgcHJvcGVydHkgb24gJ3RhcmdldCcgc2hvdWxkIGVpdGhlciByZXR1 cm4gZmFsc2Ugb3IgYmUgdGhlIHNhbWUgdmFsdWUgYWxyZWFkeSBvbiB0aGUgJ3RhcmdldCciX3Mp OworICAgICAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQ cm94eSBoYW5kbGVyJ3MgJ3NldCcgb24gYSBub24tY29uZmlndXJhYmxlIGFuZCBub24td3JpdGFi bGUgcHJvcGVydHkgb24gJ3RhcmdldCcgc2hvdWxkIGVpdGhlciByZXR1cm4gZmFsc2Ugb3IgYmUg dGhlIHNhbWUgdmFsdWUgYWxyZWFkeSBvbiB0aGUgJ3RhcmdldCciX3MpOwogICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChkZXNj cmlwdG9yLmlzQWNjZXNzb3JEZXNjcmlwdG9yKCkgJiYgIWRlc2NyaXB0b3IuY29uZmlndXJhYmxl KCkgJiYgZGVzY3JpcHRvci5zZXR0ZXIoKS5pc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgICAgICB0 aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ3Nl dCcgbWV0aG9kIG9uIGEgbm9uLWNvbmZpZ3VyYWJsZSBhY2Nlc3NvciBwcm9wZXJ0eSB3aXRob3V0 IGEgc2V0dGVyIHNob3VsZCByZXR1cm4gZmFsc2UiX3MpOworICAgICAgICAgICAgdGhyb3dUeXBl RXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5IGhhbmRsZXIncyAnc2V0JyBtZXRob2Qg b24gYSBub24tY29uZmlndXJhYmxlIGFjY2Vzc29yIHByb3BlcnR5IHdpdGhvdXQgYSBzZXR0ZXIg c2hvdWxkIHJldHVybiBmYWxzZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KICAgICB9CkBAIC02MzgsNyArNjM4LDcgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9y bURlbGV0ZShKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0eU5hbWUgcHJvcGUK IAogICAgIEpTVmFsdWUgaGFuZGxlclZhbHVlID0gdGhpcy0+aGFuZGxlcigpOwogICAgIGlmICho YW5kbGVyVmFsdWUuaXNOdWxsKCkpIHsKLSAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxP YmplY3QsIHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJldm9rZWRFcnJvck1lc3NhZ2UpOworICAgICAg ICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJldm9r ZWRFcnJvck1lc3NhZ2UpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCkBAIC02Njks MTMgKzY2OSwxMyBAQCBib29sIFByb3h5T2JqZWN0OjpwZXJmb3JtRGVsZXRlKEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnR5TmFtZSBwcm9wZQogICAgIEVYQ0VQVElPTl9BU1NF UlQoIXNjb3BlLmV4Y2VwdGlvbigpIHx8ICFyZXN1bHQpOwogICAgIGlmIChyZXN1bHQpIHsKICAg ICAgICAgaWYgKCFkZXNjcmlwdG9yLmNvbmZpZ3VyYWJsZSgpKSB7Ci0gICAgICAgICAgICB0aHJv d1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ2RlbGV0 ZVByb3BlcnR5JyBtZXRob2Qgc2hvdWxkIHJldHVybiBmYWxzZSB3aGVuIHRoZSB0YXJnZXQncyBw cm9wZXJ0eSBpcyBub3QgY29uZmlndXJhYmxlIl9zKTsKKyAgICAgICAgICAgIHRocm93VHlwZUVy cm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ2RlbGV0ZVByb3BlcnR5 JyBtZXRob2Qgc2hvdWxkIHJldHVybiBmYWxzZSB3aGVuIHRoZSB0YXJnZXQncyBwcm9wZXJ0eSBp cyBub3QgY29uZmlndXJhYmxlIl9zKTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQogICAgICAgICBib29sIHRhcmdldElzRXh0ZW5zaWJsZSA9IHRhcmdldC0+aXNFeHRlbnNp YmxlKGdsb2JhbE9iamVjdCk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZh bHNlKTsKICAgICAgICAgaWYgKCF0YXJnZXRJc0V4dGVuc2libGUpIHsKLSAgICAgICAgICAgIHRo cm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5IGhhbmRsZXIncyAnZGVs ZXRlUHJvcGVydHknIG1ldGhvZCBzaG91bGQgcmV0dXJuIGZhbHNlIHdoZW4gdGhlIHRhcmdldCBo YXMgcHJvcGVydHkgYW5kIGlzIG5vdCBleHRlbnNpYmxlIl9zKTsKKyAgICAgICAgICAgIHRocm93 VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ2RlbGV0ZVBy b3BlcnR5JyBtZXRob2Qgc2hvdWxkIHJldHVybiBmYWxzZSB3aGVuIHRoZSB0YXJnZXQgaGFzIHBy b3BlcnR5IGFuZCBpcyBub3QgZXh0ZW5zaWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgICAgIH0KICAgICB9CkBAIC03MjAsNyArNzIwLDcgQEAgYm9vbCBQcm94eU9iamVj dDo6cGVyZm9ybVByZXZlbnRFeHRlbnNpb25zKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qp CiAKICAgICBKU1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAo aGFuZGxlclZhbHVlLmlzTnVsbCgpKSB7Ci0gICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFs T2JqZWN0LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJyb3JNZXNzYWdlKTsKKyAgICAg ICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZv a2VkRXJyb3JNZXNzYWdlKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIApAQCAtNzQ2 LDcgKzc0Niw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1QcmV2ZW50RXh0ZW5zaW9ucyhK U0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogICAgICAgICBib29sIHRhcmdldElzRXh0ZW5z aWJsZSA9IHRhcmdldC0+aXNFeHRlbnNpYmxlKGdsb2JhbE9iamVjdCk7CiAgICAgICAgIFJFVFVS Tl9JRl9FWENFUFRJT04oc2NvcGUsIGZhbHNlKTsKICAgICAgICAgaWYgKHRhcmdldElzRXh0ZW5z aWJsZSkgewotICAgICAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3Bl LCAiUHJveHkncyAncHJldmVudEV4dGVuc2lvbnMnIHRyYXAgcmV0dXJuZWQgdHJ1ZSBldmVuIHRo b3VnaCBpdHMgdGFyZ2V0IGlzIGV4dGVuc2libGUuIEl0IHNob3VsZCBoYXZlIHJldHVybmVkIGZh bHNlIl9zKTsKKyAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUs ICJQcm94eSdzICdwcmV2ZW50RXh0ZW5zaW9ucycgdHJhcCByZXR1cm5lZCB0cnVlIGV2ZW4gdGhv dWdoIGl0cyB0YXJnZXQgaXMgZXh0ZW5zaWJsZS4gSXQgc2hvdWxkIGhhdmUgcmV0dXJuZWQgZmFs c2UiX3MpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgfQpAQCAt NzcyLDcgKzc3Miw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1Jc0V4dGVuc2libGUoSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKIAogICAgIEpTVmFsdWUgaGFuZGxlclZhbHVlID0g dGhpcy0+aGFuZGxlcigpOwogICAgIGlmIChoYW5kbGVyVmFsdWUuaXNOdWxsKCkpIHsKLSAgICAg ICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJl dm9rZWRFcnJvck1lc3NhZ2UpOworICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3Qs IHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJldm9rZWRFcnJvck1lc3NhZ2UpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogCkBAIC04MDEsMTEgKzgwMSwxMSBAQCBib29sIFByb3h5T2JqZWN0 OjpwZXJmb3JtSXNFeHRlbnNpYmxlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiAgICAg aWYgKHRyYXBSZXN1bHRBc0Jvb2wgIT0gaXNUYXJnZXRFeHRlbnNpYmxlKSB7CiAgICAgICAgIGlm IChpc1RhcmdldEV4dGVuc2libGUpIHsKICAgICAgICAgICAgIEFTU0VSVCghdHJhcFJlc3VsdEFz Qm9vbCk7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUs ICJQcm94eSBvYmplY3QncyAnaXNFeHRlbnNpYmxlJyB0cmFwIHJldHVybmVkIGZhbHNlIHdoZW4g dGhlIHRhcmdldCBpcyBleHRlbnNpYmxlLiBJdCBzaG91bGQgaGF2ZSByZXR1cm5lZCB0cnVlIl9z KTsKKyAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94 eSBvYmplY3QncyAnaXNFeHRlbnNpYmxlJyB0cmFwIHJldHVybmVkIGZhbHNlIHdoZW4gdGhlIHRh cmdldCBpcyBleHRlbnNpYmxlLiBJdCBzaG91bGQgaGF2ZSByZXR1cm5lZCB0cnVlIl9zKTsKICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFTU0VSVCghaXNUYXJnZXRFeHRlbnNpYmxlKTsK ICAgICAgICAgICAgIEFTU0VSVCh0cmFwUmVzdWx0QXNCb29sKTsKLSAgICAgICAgICAgIHRocm93 Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5IG9iamVjdCdzICdpc0V4dGVu c2libGUnIHRyYXAgcmV0dXJuZWQgdHJ1ZSB3aGVuIHRoZSB0YXJnZXQgaXMgbm9uLWV4dGVuc2li bGUuIEl0IHNob3VsZCBoYXZlIHJldHVybmVkIGZhbHNlIl9zKTsKKyAgICAgICAgICAgIHRocm93 VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSBvYmplY3QncyAnaXNFeHRlbnNp YmxlJyB0cmFwIHJldHVybmVkIHRydWUgd2hlbiB0aGUgdGFyZ2V0IGlzIG5vbi1leHRlbnNpYmxl LiBJdCBzaG91bGQgaGF2ZSByZXR1cm5lZCBmYWxzZSJfcyk7CiAgICAgICAgIH0KICAgICB9CiAg ICAgCkBAIC04MzgsNyArODM4LDcgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93 blByb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnQKIAogICAgIEpT VmFsdWUgaGFuZGxlclZhbHVlID0gdGhpcy0+aGFuZGxlcigpOwogICAgIGlmIChoYW5kbGVyVmFs dWUuaXNOdWxsKCkpIHsKLSAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNj b3BlLCBzX3Byb3h5QWxyZWFkeVJldm9rZWRFcnJvck1lc3NhZ2UpOworICAgICAgICB0aHJvd1R5 cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCBzX3Byb3h5QWxyZWFkeVJldm9rZWRFcnJvck1l c3NhZ2UpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCkBAIC04NjUsOCArODY1LDEx IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1EZWZpbmVPd25Qcm9wZXJ0eShKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZXJ0CiAgICAgYm9vbCB0cmFwUmVzdWx0QXNCb29sID0g dHJhcFJlc3VsdC50b0Jvb2xlYW4oZ2xvYmFsT2JqZWN0KTsKICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHNjb3BlLCBmYWxzZSk7CiAKLSAgICBpZiAoIXRyYXBSZXN1bHRBc0Jvb2wpCisgICAgaWYg KCF0cmFwUmVzdWx0QXNCb29sKSB7CisgICAgICAgIGlmIChzaG91bGRUaHJvdykKKyAgICAgICAg ICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIG1ha2VTdHJpbmcoIlByb3h5 J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIHJldHVybmVkIGZhbHN5IHZhbHVlIGZvciBwcm9wZXJ0 eSAnIiwgU3RyaW5nKHByb3BlcnR5TmFtZS51aWQoKSksICInIikpOwogICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgfQogCiAgICAgUHJvcGVydHlEZXNjcmlwdG9yIHRhcmdldERlc2NyaXB0b3I7 CiAgICAgYm9vbCBpc1RhcmdldERlc2NyaXB0b3JEZWZpbmVkID0gdGFyZ2V0LT5nZXRPd25Qcm9w ZXJ0eURlc2NyaXB0b3IoZ2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHRhcmdldERlc2NyaXB0 b3IpOwpAQCAtODc4LDExICs4ODEsMTEgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybURlZmlu ZU93blByb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnQKIAogICAg IGlmICghaXNUYXJnZXREZXNjcmlwdG9yRGVmaW5lZCkgewogICAgICAgICBpZiAoIXRhcmdldElz RXh0ZW5zaWJsZSkgewotICAgICAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3Qs IHNjb3BlLCAiUHJveHkncyAnZGVmaW5lUHJvcGVydHknIHRyYXAgcmV0dXJuZWQgdHJ1ZSBldmVu IHRob3VnaCBnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3Igb2YgdGhlIFByb3h5J3MgdGFyZ2V0IHJl dHVybmVkIHVuZGVmaW5lZCBhbmQgdGhlIHRhcmdldCBpcyBub24tZXh0ZW5zaWJsZSJfcyk7Cisg ICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkncyAn ZGVmaW5lUHJvcGVydHknIHRyYXAgcmV0dXJuZWQgdHJ1ZSBldmVuIHRob3VnaCBnZXRPd25Qcm9w ZXJ0eURlc2NyaXB0b3Igb2YgdGhlIFByb3h5J3MgdGFyZ2V0IHJldHVybmVkIHVuZGVmaW5lZCBh bmQgdGhlIHRhcmdldCBpcyBub24tZXh0ZW5zaWJsZSJfcyk7CiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHNldHRpbmdDb25maWd1cmFibGVUb0ZhbHNl KSB7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQ cm94eSdzICdkZWZpbmVQcm9wZXJ0eScgdHJhcCByZXR1cm5lZCB0cnVlIGZvciBhIG5vbi1jb25m aWd1cmFibGUgZmllbGQgZXZlbiB0aG91Z2ggZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yIG9mIHRo ZSBQcm94eSdzIHRhcmdldCByZXR1cm5lZCB1bmRlZmluZWQiX3MpOworICAgICAgICAgICAgdGhy b3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5 JyB0cmFwIHJldHVybmVkIHRydWUgZm9yIGEgbm9uLWNvbmZpZ3VyYWJsZSBmaWVsZCBldmVuIHRo b3VnaCBnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3Igb2YgdGhlIFByb3h5J3MgdGFyZ2V0IHJldHVy bmVkIHVuZGVmaW5lZCJfcyk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0K IApAQCAtODk2LDExICs4OTksMTEgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93 blByb3BlcnR5KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFByb3BlcnQKICAgICBib29s IGlzQ29tcGF0aWJsZURlc2NyaXB0b3IgPSB2YWxpZGF0ZUFuZEFwcGx5UHJvcGVydHlEZXNjcmlw dG9yKGdsb2JhbE9iamVjdCwgbnVsbHB0ciwgcHJvcGVydHlOYW1lLCB0YXJnZXRJc0V4dGVuc2li bGUsIGRlc2NyaXB0b3IsIGlzQ3VycmVudERlZmluZWQsIGN1cnJlbnQsIHRocm93RXhjZXB0aW9u KTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBmYWxzZSk7ICAgIAogICAgIGlmICgh aXNDb21wYXRpYmxlRGVzY3JpcHRvcikgewotICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2Jh bE9iamVjdCwgc2NvcGUsICJQcm94eSdzICdkZWZpbmVQcm9wZXJ0eScgdHJhcCBkaWQgbm90IGRl ZmluZSBhIHByb3BlcnR5IG9uIGl0cyB0YXJnZXQgdGhhdCBpcyBjb21wYXRpYmxlIHdpdGggdGhl IHRyYXAncyBpbnB1dCBkZXNjcmlwdG9yIl9zKTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xv YmFsT2JqZWN0LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIGRpZCBub3Qg ZGVmaW5lIGEgcHJvcGVydHkgb24gaXRzIHRhcmdldCB0aGF0IGlzIGNvbXBhdGlibGUgd2l0aCB0 aGUgdHJhcCdzIGlucHV0IGRlc2NyaXB0b3IiX3MpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogICAgIGlmIChzZXR0aW5nQ29uZmlndXJhYmxlVG9GYWxzZSAmJiB0YXJnZXREZXNjcmlw dG9yLmNvbmZpZ3VyYWJsZSgpKSB7Ci0gICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2Jq ZWN0LCBzY29wZSwgIlByb3h5J3MgJ2RlZmluZVByb3BlcnR5JyB0cmFwIGRpZCBub3QgZGVmaW5l IGEgbm9uLWNvbmZpZ3VyYWJsZSBwcm9wZXJ0eSBvbiBpdHMgdGFyZ2V0IGV2ZW4gdGhvdWdoIHRo ZSBpbnB1dCBkZXNjcmlwdG9yIHRvIHRoZSB0cmFwIHNhaWQgaXQgbXVzdCBkbyBzbyJfcyk7Cisg ICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSdzICdkZWZp bmVQcm9wZXJ0eScgdHJhcCBkaWQgbm90IGRlZmluZSBhIG5vbi1jb25maWd1cmFibGUgcHJvcGVy dHkgb24gaXRzIHRhcmdldCBldmVuIHRob3VnaCB0aGUgaW5wdXQgZGVzY3JpcHRvciB0byB0aGUg dHJhcCBzYWlkIGl0IG11c3QgZG8gc28iX3MpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQogICAgIGlmICh0YXJnZXREZXNjcmlwdG9yLmlzRGF0YURlc2NyaXB0b3IoKSAmJiAhdGFyZ2V0 RGVzY3JpcHRvci5jb25maWd1cmFibGUoKSAmJiB0YXJnZXREZXNjcmlwdG9yLndyaXRhYmxlKCkp IHsKQEAgLTkzMSw3ICs5MzQsNyBAQCB2b2lkIFByb3h5T2JqZWN0OjpwZXJmb3JtR2V0T3duUHJv cGVydHlOYW1lcyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBQcm9wZQogICAgIH0KICAg ICBKU1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxl clZhbHVlLmlzTnVsbCgpKSB7Ci0gICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0 LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJyb3JNZXNzYWdlKTsKKyAgICAgICAgdGhy b3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJy b3JNZXNzYWdlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTAyMyw3ICsxMDI2LDcg QEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TmFtZXMoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGUKIAogICAgIGZvciAoVW5pcXVlZFN0cmluZ0ltcGwq IGltcGwgOiB0YXJnZXROb25Db25maWd1cmFibGVLZXlzKSB7CiAgICAgICAgIGlmIChyZW1vdmVJ ZkNvbnRhaW5lZEluVW5jaGVja2VkUmVzdWx0S2V5cyhpbXBsKSA9PSBJc05vdENvbnRhaW5lZElu KSB7Ci0gICAgICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIG1h a2VTdHJpbmcoIlByb3h5IG9iamVjdCdzICd0YXJnZXQnIGhhcyB0aGUgbm9uLWNvbmZpZ3VyYWJs ZSBwcm9wZXJ0eSAnIiwgU3RyaW5nKGltcGwpLCAiJyB0aGF0IHdhcyBub3QgaW4gdGhlIHJlc3Vs dCBmcm9tIHRoZSAnb3duS2V5cycgdHJhcCIpKTsKKyAgICAgICAgICAgIHRocm93VHlwZUVycm9y KGdsb2JhbE9iamVjdCwgc2NvcGUsIG1ha2VTdHJpbmcoIlByb3h5IG9iamVjdCdzICd0YXJnZXQn IGhhcyB0aGUgbm9uLWNvbmZpZ3VyYWJsZSBwcm9wZXJ0eSAnIiwgU3RyaW5nKGltcGwpLCAiJyB0 aGF0IHdhcyBub3QgaW4gdGhlIHJlc3VsdCBmcm9tIHRoZSAnb3duS2V5cycgdHJhcCIpKTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTEwMzEsMTMgKzEwMzQsMTMg QEAgdm9pZCBQcm94eU9iamVjdDo6cGVyZm9ybUdldE93blByb3BlcnR5TmFtZXMoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCwgUHJvcGUKICAgICBpZiAoIXRhcmdldElzRXhlbnNpYmxlKSB7 CiAgICAgICAgIGZvciAoVW5pcXVlZFN0cmluZ0ltcGwqIGltcGwgOiB0YXJnZXRDb25maWd1cmFi bGVLZXlzKSB7CiAgICAgICAgICAgICBpZiAocmVtb3ZlSWZDb250YWluZWRJblVuY2hlY2tlZFJl c3VsdEtleXMoaW1wbCkgPT0gSXNOb3RDb250YWluZWRJbikgewotICAgICAgICAgICAgICAgIHRo cm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgbWFrZVN0cmluZygiUHJveHkgb2Jq ZWN0J3Mgbm9uLWV4dGVuc2libGUgJ3RhcmdldCcgaGFzIGNvbmZpZ3VyYWJsZSBwcm9wZXJ0eSAn IiwgU3RyaW5nKGltcGwpLCAiJyB0aGF0IHdhcyBub3QgaW4gdGhlIHJlc3VsdCBmcm9tIHRoZSAn b3duS2V5cycgdHJhcCIpKTsKKyAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxP YmplY3QsIHNjb3BlLCBtYWtlU3RyaW5nKCJQcm94eSBvYmplY3QncyBub24tZXh0ZW5zaWJsZSAn dGFyZ2V0JyBoYXMgY29uZmlndXJhYmxlIHByb3BlcnR5ICciLCBTdHJpbmcoaW1wbCksICInIHRo YXQgd2FzIG5vdCBpbiB0aGUgcmVzdWx0IGZyb20gdGhlICdvd25LZXlzJyB0cmFwIikpOwogICAg ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAg IGlmICh1bmNoZWNrZWRSZXN1bHRLZXlzLnNpemUoKSkgewotICAgICAgICAgICAgdGhyb3dWTVR5 cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkgaGFuZGxlcidzICdvd25LZXlzJyBt ZXRob2QgcmV0dXJuZWQgYSBrZXkgdGhhdCB3YXMgbm90IHByZXNlbnQgaW4gaXRzIG5vbi1leHRl bnNpYmxlIHRhcmdldCJfcyk7CisgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmpl Y3QsIHNjb3BlLCAiUHJveHkgaGFuZGxlcidzICdvd25LZXlzJyBtZXRob2QgcmV0dXJuZWQgYSBr ZXkgdGhhdCB3YXMgbm90IHByZXNlbnQgaW4gaXRzIG5vbi1leHRlbnNpYmxlIHRhcmdldCJfcyk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CkBAIC0xMTEwLDcgKzExMTMs NyBAQCBib29sIFByb3h5T2JqZWN0OjpwZXJmb3JtU2V0UHJvdG90eXBlKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgcHJvdAogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUg PSB0aGlzLT5oYW5kbGVyKCk7CiAgICAgaWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewotICAg ICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsIHNfcHJveHlBbHJlYWR5 UmV2b2tlZEVycm9yTWVzc2FnZSk7CisgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVj dCwgc2NvcGUsIHNfcHJveHlBbHJlYWR5UmV2b2tlZEVycm9yTWVzc2FnZSk7CiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTExMzYsNyArMTEzOSw3IEBAIGJvb2wgUHJveHlPYmpl Y3Q6OnBlcmZvcm1TZXRQcm90b3R5cGUoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNW YWx1ZSBwcm90CiAgICAgCiAgICAgaWYgKCF0cmFwUmVzdWx0QXNCb29sKSB7CiAgICAgICAgIGlm IChzaG91bGRUaHJvd0lmQ2FudFNldCkKLSAgICAgICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xv YmFsT2JqZWN0LCBzY29wZSwgIlByb3h5ICdzZXRQcm90b3R5cGVPZicgcmV0dXJuZWQgZmFsc2Ug aW5kaWNhdGluZyBpdCBjb3VsZCBub3Qgc2V0IHRoZSBwcm90b3R5cGUgdmFsdWUuIFRoZSBvcGVy YXRpb24gd2FzIGV4cGVjdGVkIHRvIHN1Y2NlZWQiX3MpOworICAgICAgICAgICAgdGhyb3dUeXBl RXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5ICdzZXRQcm90b3R5cGVPZicgcmV0dXJu ZWQgZmFsc2UgaW5kaWNhdGluZyBpdCBjb3VsZCBub3Qgc2V0IHRoZSBwcm90b3R5cGUgdmFsdWUu IFRoZSBvcGVyYXRpb24gd2FzIGV4cGVjdGVkIHRvIHN1Y2NlZWQiX3MpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogCkBAIC0xMTUwLDcgKzExNTMsNyBAQCBib29sIFByb3h5T2JqZWN0 OjpwZXJmb3JtU2V0UHJvdG90eXBlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTVmFs dWUgcHJvdAogICAgIGJvb2wgaXNTYW1lID0gc2FtZVZhbHVlKGdsb2JhbE9iamVjdCwgcHJvdG90 eXBlLCB0YXJnZXRQcm90b3R5cGUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZh bHNlKTsKICAgICBpZiAoIWlzU2FtZSkgewotICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2Jh bE9iamVjdCwgc2NvcGUsICJQcm94eSAnc2V0UHJvdG90eXBlT2YnIHRyYXAgcmV0dXJuZWQgdHJ1 ZSB3aGVuIGl0cyB0YXJnZXQgaXMgbm9uLWV4dGVuc2libGUgYW5kIHRoZSBuZXcgcHJvdG90eXBl IHZhbHVlIGlzIG5vdCB0aGUgc2FtZSBhcyB0aGUgY3VycmVudCBwcm90b3R5cGUgdmFsdWUuIEl0 IHNob3VsZCBoYXZlIHJldHVybmVkIGZhbHNlIl9zKTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3Io Z2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5ICdzZXRQcm90b3R5cGVPZicgdHJhcCByZXR1cm5l ZCB0cnVlIHdoZW4gaXRzIHRhcmdldCBpcyBub24tZXh0ZW5zaWJsZSBhbmQgdGhlIG5ldyBwcm90 b3R5cGUgdmFsdWUgaXMgbm90IHRoZSBzYW1lIGFzIHRoZSBjdXJyZW50IHByb3RvdHlwZSB2YWx1 ZS4gSXQgc2hvdWxkIGhhdmUgcmV0dXJuZWQgZmFsc2UiX3MpOwogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogCkBAIC0xMTc1LDcgKzExNzgsNyBAQCBKU1ZhbHVlIFByb3h5T2JqZWN0Ojpw ZXJmb3JtR2V0UHJvdG90eXBlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiAKICAgICBK U1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxlclZh bHVlLmlzTnVsbCgpKSB7Ci0gICAgICAgIHRocm93Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBz Y29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJyb3JNZXNzYWdlKTsKKyAgICAgICAgdGhyb3dU eXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgc19wcm94eUFscmVhZHlSZXZva2VkRXJyb3JN ZXNzYWdlKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKQEAgLTExOTYsNyArMTE5OSw3 IEBAIEpTVmFsdWUgUHJveHlPYmplY3Q6OnBlcmZvcm1HZXRQcm90b3R5cGUoSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCkKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwog CiAgICAgaWYgKCF0cmFwUmVzdWx0LmlzT2JqZWN0KCkgJiYgIXRyYXBSZXN1bHQuaXNOdWxsKCkp IHsKLSAgICAgICAgdGhyb3dWTVR5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiUHJveHkg aGFuZGxlcidzICdnZXRQcm90b3R5cGVPZicgdHJhcCBzaG91bGQgZWl0aGVyIHJldHVybiBhbiBv YmplY3Qgb3IgbnVsbCJfcyk7CisgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9iamVjdCwg c2NvcGUsICJQcm94eSBoYW5kbGVyJ3MgJ2dldFByb3RvdHlwZU9mJyB0cmFwIHNob3VsZCBlaXRo ZXIgcmV0dXJuIGFuIG9iamVjdCBvciBudWxsIl9zKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAg ICB9CiAKQEAgLTEyMTAsNyArMTIxMyw3IEBAIEpTVmFsdWUgUHJveHlPYmplY3Q6OnBlcmZvcm1H ZXRQcm90b3R5cGUoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkKICAgICBib29sIGlzU2Ft ZSA9IHNhbWVWYWx1ZShnbG9iYWxPYmplY3QsIHRhcmdldFByb3RvdHlwZSwgdHJhcFJlc3VsdCk7 CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICBpZiAoIWlzU2FtZSkg ewotICAgICAgICB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUsICJQcm94eSdz ICdnZXRQcm90b3R5cGVPZicgdHJhcCBmb3IgYSBub24tZXh0ZW5zaWJsZSB0YXJnZXQgc2hvdWxk IHJldHVybiB0aGUgc2FtZSB2YWx1ZSBhcyB0aGUgdGFyZ2V0J3MgcHJvdG90eXBlIl9zKTsKKyAg ICAgICAgdGhyb3dUeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSwgIlByb3h5J3MgJ2dldFBy b3RvdHlwZU9mJyB0cmFwIGZvciBhIG5vbi1leHRlbnNpYmxlIHRhcmdldCBzaG91bGQgcmV0dXJu IHRoZSBzYW1lIHZhbHVlIGFzIHRoZSB0YXJnZXQncyBwcm90b3R5cGUiX3MpOwogICAgICAgICBy ZXR1cm4geyB9OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rl c3RzL0NoYW5nZUxvZwppbmRleCAwNmQ4ODVkNDg5ZTM3MGEyNGUzNWYwMGVhZjUxZDFiY2U0ZTU3 MWM4Li5kYzllOGQ3YjQ5ZjNjOWIyMWFmYzg5NTRiYzRmZGYyZmI1MWIyZDRjIDEwMDY0NAotLS0g YS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIwLTA0LTA5ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4K KworICAgICAgICBQcm94eU9iamVjdDo6ZGVmaW5lT3duUHJvcGVydHkoKSBzaG91bGQgY29uZGl0 aW9uYWxseSB0aHJvdyBvbiBmYWxzeSB0cmFwIHJlc3VsdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Um9zcyBLaXJzbGluZy4KKworICAgICAgICAqIHRlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWw6IE1h cmsgMiB0ZXN0IGNhc2VzIGFzIHBhc3NpbmcuCisKIDIwMjAtMDQtMDkgIEFsZXhleSBTaHZheWth ICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIGdldE93blByb3BlcnR5RGVzY3Jp cHRvcigpIGlzIGluY29ycmVjdCB3aXRoIFByb3h5IG9mIGV4b3RpYyBvYmplY3QKZGlmZiAtLWdp dCBhL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbCBiL0pTVGVzdHMvdGVzdDI2Mi9l eHBlY3RhdGlvbnMueWFtbAppbmRleCA3YmQ3ZDdmODk2ZWY4MmJjM2IwODc5ZjEzMDVhYzYwODAy ZDY2N2IyLi45NGJjZmQ3MmMzY2MyMThlYzNkNjdlYmRhMmI4NDBjOGRkMGQ1M2NjIDEwMDY0NAot LS0gYS9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKKysrIGIvSlNUZXN0cy90ZXN0 MjYyL2V4cGVjdGF0aW9ucy55YW1sCkBAIC0xMjQ5LDkgKzEyNDksNiBAQCB0ZXN0L2J1aWx0LWlu cy9Qcm94eS9jcmVhdGUtdGFyZ2V0LWlzLXJldm9rZWQtZnVuY3Rpb24tcHJveHkuanM6CiB0ZXN0 L2J1aWx0LWlucy9Qcm94eS9jcmVhdGUtdGFyZ2V0LWlzLXJldm9rZWQtcHJveHkuanM6CiAgIGRl ZmF1bHQ6ICJUeXBlRXJyb3I6IEEgUHJveHkncyAndGFyZ2V0JyBzaG91bGRuJ3QgYmUgYSByZXZv a2VkIFByb3h5IgogICBzdHJpY3QgbW9kZTogIlR5cGVFcnJvcjogQSBQcm94eSdzICd0YXJnZXQn IHNob3VsZG4ndCBiZSBhIHJldm9rZWQgUHJveHkiCi10ZXN0L2J1aWx0LWlucy9Qcm94eS9kZWZp bmVQcm9wZXJ0eS90cmFwLWlzLXVuZGVmaW5lZC10YXJnZXQtaXMtcHJveHkuanM6Ci0gIGRlZmF1 bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIGEgVHlwZUVycm9yIHRvIGJlIHRocm93biBidXQg bm8gZXhjZXB0aW9uIHdhcyB0aHJvd24gYXQgYWxsJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJF cnJvcjogRXhwZWN0ZWQgYSBUeXBlRXJyb3IgdG8gYmUgdGhyb3duIGJ1dCBubyBleGNlcHRpb24g d2FzIHRocm93biBhdCBhbGwnCiB0ZXN0L2J1aWx0LWlucy9Qcm94eS9vd25LZXlzL3RyYXAtaXMt dW5kZWZpbmVkLXRhcmdldC1pcy1wcm94eS5qczoKICAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjog RXhwZWN0ZWQgW2xlbmd0aCwgZm9vLCAwLCBTeW1ib2woKV0gYW5kIFtTeW1ib2woKSwgbGVuZ3Ro LCBmb28sIDBdIHRvIGhhdmUgdGhlIHNhbWUgY29udGVudHMuICcKICAgc3RyaWN0IG1vZGU6ICdU ZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFtsZW5ndGgsIGZvbywgMCwgU3ltYm9sKCldIGFuZCBbU3lt Ym9sKCksIGxlbmd0aCwgZm9vLCAwXSB0byBoYXZlIHRoZSBzYW1lIGNvbnRlbnRzLiAnCg==