237018 2022-02-21 21:51:25 -0800 [WebAuthn] Fix lifetime issue in WebAuthenticatorCoordinatorProxy 2022-02-22 10:22:50 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pascoe pascoe bfulgham ews-watchlist jiewen_tan webkit-bug-importer oldest_to_newest 1844544 0 pascoe 2022-02-21 21:51:25 -0800 A recent refactor to the completion handler in performRequest resulted in registrations not to complete. 1844545 1 pascoe 2022-02-21 21:51:44 -0800 rdar://89206950 1844551 2 452825 pascoe 2022-02-21 22:20:57 -0800 Created attachment 452825 Patch 1844741 3 452825 bfulgham 2022-02-22 09:22:14 -0800 Comment on attachment 452825 Patch r=me 1844778 4 ews-feeder 2022-02-22 10:22:45 -0800 Committed r290317 (247639@main): <https://commits.webkit.org/247639@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452825. 452825 2022-02-21 22:20:57 -0800 2022-02-22 10:22:48 -0800 Patch bug-237018-20220221222056.patch text/plain 15444 pascoe U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJiY2IzNjE0ZWI5YTVlN2Fl Mzg1MGFhYWY0NDg0NmQwZjNlMWE0ZDcuLjUzNzlhZmYyMWYxYWIyNTI5ZTk3OTA3NGIxNzc0OThl NDFiMmY0NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMjEgIEogUGFzY29l ICA8al9wYXNjb2VAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBdXRobl0gRml4IGxpZmV0aW1l IGlzc3VlIG9uIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM3MDE4CisgICAgICAgIHJkYXI6Ly84OTIwNjk1MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExpZmV0aW1lIGlzc3VlcyBpbnRyb2R1Y2Vk IGluIGEgcmVjZW50IHJlZmFjdG9yIG9mIHBlcmZvcm1SZXF1ZXN0IHdlcmUgY2F1c2luZworICAg ICAgICByZXBsaWVzIGZyb20gV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHlfTWFrZUNy ZWRlbnRpYWxSZXBseSBub3QgdG8gbWFrZSBpdAorICAgICAgICBiYWNrIHRvIHRoZSB3ZWIgY29u dGVudCBwcm9jZXNzLiBUaGlzIHBhdGNoIGZpeGVzIHRoZXNlLCBhbGxvd2luZyByZXF1ZXN0cyB0 byBwcm9jZWVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29h L1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0Ojpj b250aW51ZUFmdGVyUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dGhlbnRpY2F0b3JD b29yZGluYXRvclByb3h5OjpwZXJmb3JtUmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OldlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Ojppc0NvbmRpdGlvbmFsTWVkaWF0 aW9uQXZhaWxhYmxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQXV0aGVudGljYXRv ckNvb3JkaW5hdG9yUHJveHk6OmlzVXNlclZlcmlmeWluZ1BsYXRmb3JtQXV0aGVudGljYXRvckF2 YWlsYWJsZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9u L1dlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Lmg6CisKIDIwMjItMDItMjEgIFBlciBB cm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gUmVtb3Zl IHJlc291cmNlIGFjY2VzcyBpbiBzYW5kYm94IGZvciBvbGRlciBPUyB2ZXJzaW9ucwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvV2Vi QXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94 eS5tbQppbmRleCBkMjhmNGU1NmQyMTYxZTU1MDI4MjY2ZjQzZDRkYmIwM2YyYWUxYmEyLi5kZTE3 NGQzZjgyOTA3YTNkZTllMmMyZTQwMDdlZWMwMDNjZDcxZTFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9y Q29vcmRpbmF0b3JQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRo ZW50aWNhdGlvbi9Db2NvYS9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5tbQpAQCAt MzA3LDEwMSArMzA3LDEwNyBAQCBSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0 PiBXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eTo6Y29udGV4dAogICAgIHJldHVybiBy ZXN1bHQ7CiB9CiAKLXZvaWQgV2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OnBlcmZv cm1SZXF1ZXN0KFJldGFpblB0cjxBU0NDcmVkZW50aWFsUmVxdWVzdENvbnRleHQ+IHJlcXVlc3RD b250ZXh0LCBSZXF1ZXN0Q29tcGxldGlvbkhhbmRsZXImJiBoYW5kbGVyKQorc3RhdGljIGlubGlu ZSB2b2lkIGNvbnRpbnVlQWZ0ZXJSZXF1ZXN0KFJldGFpblB0cjxpZCA8QVNDQ3JlZGVudGlhbFBy b3RvY29sPj4gY3JlZGVudGlhbCwgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yLCBSZXF1ZXN0Q29t cGxldGlvbkhhbmRsZXImJiBoYW5kbGVyKQogewotICAgIGF1dG8gcHJveHkgPSBhZG9wdE5TKFth bGxvY0FTQ0FnZW50UHJveHlJbnN0YW5jZSgpIGluaXRdKTsKKyAgICBBdXRoZW50aWNhdG9yUmVz cG9uc2VEYXRhIHJlc3BvbnNlID0geyB9OworICAgIEF1dGhlbnRpY2F0b3JBdHRhY2htZW50IGF0 dGFjaG1lbnQ7CisgICAgRXhjZXB0aW9uRGF0YSBleGNlcHRpb25EYXRhID0geyB9OworCisgICAg aWYgKFtjcmVkZW50aWFsIGlzS2luZE9mQ2xhc3M6Z2V0QVNDUGxhdGZvcm1QdWJsaWNLZXlDcmVk ZW50aWFsUmVnaXN0cmF0aW9uQ2xhc3MoKV0pIHsKKyAgICAgICAgYXR0YWNobWVudCA9IEF1dGhl bnRpY2F0b3JBdHRhY2htZW50OjpQbGF0Zm9ybTsKKyAgICAgICAgcmVzcG9uc2UuaXNBdXRoZW50 aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSA9IHRydWU7CisKKyAgICAgICAgQVNDUGxhdGZvcm1Q dWJsaWNLZXlDcmVkZW50aWFsUmVnaXN0cmF0aW9uICpyZWdpc3RyYXRpb25DcmVkZW50aWFsID0g Y3JlZGVudGlhbC5nZXQoKTsKKyAgICAgICAgcmVzcG9uc2UucmF3SWQgPSB0b0FycmF5QnVmZmVy KHJlZ2lzdHJhdGlvbkNyZWRlbnRpYWwuY3JlZGVudGlhbElEKTsKKyAgICAgICAgcmVzcG9uc2Uu YXR0ZXN0YXRpb25PYmplY3QgPSB0b0FycmF5QnVmZmVyKHJlZ2lzdHJhdGlvbkNyZWRlbnRpYWwu YXR0ZXN0YXRpb25PYmplY3QpOworICAgIH0gZWxzZSBpZiAoW2NyZWRlbnRpYWwgaXNLaW5kT2ZD bGFzczpnZXRBU0NTZWN1cml0eUtleVB1YmxpY0tleUNyZWRlbnRpYWxSZWdpc3RyYXRpb25DbGFz cygpXSkgeworICAgICAgICBhdHRhY2htZW50ID0gQXV0aGVudGljYXRvckF0dGFjaG1lbnQ6OkNy b3NzUGxhdGZvcm07CisgICAgICAgIHJlc3BvbnNlLmlzQXV0aGVudGljYXRvckF0dGVzdGF0aW9u UmVzcG9uc2UgPSB0cnVlOworCisgICAgICAgIEFTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3JlZGVu dGlhbFJlZ2lzdHJhdGlvbiAqcmVnaXN0cmF0aW9uQ3JlZGVudGlhbCA9IGNyZWRlbnRpYWwuZ2V0 KCk7CisgICAgICAgIHJlc3BvbnNlLnJhd0lkID0gdG9BcnJheUJ1ZmZlcihyZWdpc3RyYXRpb25D cmVkZW50aWFsLmNyZWRlbnRpYWxJRCk7CisgICAgICAgIHJlc3BvbnNlLmF0dGVzdGF0aW9uT2Jq ZWN0ID0gdG9BcnJheUJ1ZmZlcihyZWdpc3RyYXRpb25DcmVkZW50aWFsLmF0dGVzdGF0aW9uT2Jq ZWN0KTsKKyAgICB9IGVsc2UgaWYgKFtjcmVkZW50aWFsIGlzS2luZE9mQ2xhc3M6Z2V0QVNDUGxh dGZvcm1QdWJsaWNLZXlDcmVkZW50aWFsQXNzZXJ0aW9uQ2xhc3MoKV0pIHsKKyAgICAgICAgYXR0 YWNobWVudCA9IEF1dGhlbnRpY2F0b3JBdHRhY2htZW50OjpQbGF0Zm9ybTsKKyAgICAgICAgcmVz cG9uc2UuaXNBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSA9IGZhbHNlOworCisgICAg ICAgIEFTQ1BsYXRmb3JtUHVibGljS2V5Q3JlZGVudGlhbEFzc2VydGlvbiAqYXNzZXJ0aW9uQ3Jl ZGVudGlhbCA9IGNyZWRlbnRpYWwuZ2V0KCk7CisgICAgICAgIHJlc3BvbnNlLnJhd0lkID0gdG9B cnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLmNyZWRlbnRpYWxJRCk7CisgICAgICAgIHJl c3BvbnNlLmF1dGhlbnRpY2F0b3JEYXRhID0gdG9BcnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50 aWFsLmF1dGhlbnRpY2F0b3JEYXRhKTsKKyAgICAgICAgcmVzcG9uc2Uuc2lnbmF0dXJlID0gdG9B cnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLnNpZ25hdHVyZSk7CisgICAgICAgIHJlc3Bv bnNlLnVzZXJIYW5kbGUgPSB0b0FycmF5QnVmZmVyKGFzc2VydGlvbkNyZWRlbnRpYWwudXNlckhh bmRsZSk7CisgICAgfSBlbHNlIGlmIChbY3JlZGVudGlhbCBpc0tpbmRPZkNsYXNzOmdldEFTQ1Nl Y3VyaXR5S2V5UHVibGljS2V5Q3JlZGVudGlhbEFzc2VydGlvbkNsYXNzKCldKSB7CisgICAgICAg IGF0dGFjaG1lbnQgPSBBdXRoZW50aWNhdG9yQXR0YWNobWVudDo6Q3Jvc3NQbGF0Zm9ybTsKKyAg ICAgICAgcmVzcG9uc2UuaXNBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSA9IGZhbHNl OworCisgICAgICAgIEFTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3JlZGVudGlhbEFzc2VydGlvbiAq YXNzZXJ0aW9uQ3JlZGVudGlhbCA9IGNyZWRlbnRpYWwuZ2V0KCk7CisgICAgICAgIHJlc3BvbnNl LnJhd0lkID0gdG9BcnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLmNyZWRlbnRpYWxJRCk7 CisgICAgICAgIHJlc3BvbnNlLmF1dGhlbnRpY2F0b3JEYXRhID0gdG9BcnJheUJ1ZmZlcihhc3Nl cnRpb25DcmVkZW50aWFsLmF1dGhlbnRpY2F0b3JEYXRhKTsKKyAgICAgICAgcmVzcG9uc2Uuc2ln bmF0dXJlID0gdG9BcnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLnNpZ25hdHVyZSk7Cisg ICAgICAgIHJlc3BvbnNlLnVzZXJIYW5kbGUgPSB0b0FycmF5QnVmZmVyKGFzc2VydGlvbkNyZWRl bnRpYWwudXNlckhhbmRsZSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgYXR0YWNobWVudCA9IChB dXRoZW50aWNhdG9yQXR0YWNobWVudCkgMDsKKyAgICAgICAgRXhjZXB0aW9uQ29kZSBleGNlcHRp b25Db2RlOworICAgICAgICBOU1N0cmluZyAqZXJyb3JNZXNzYWdlID0gbmlsOworICAgICAgICBp ZiAoW2Vycm9yLmdldCgpLmRvbWFpbiBpc0VxdWFsVG9TdHJpbmc6V0tFcnJvckRvbWFpbl0pIHsK KyAgICAgICAgICAgIGV4Y2VwdGlvbkNvZGUgPSB0b0V4Y2VwdGlvbkNvZGUoZXJyb3IuZ2V0KCku Y29kZSk7CisgICAgICAgICAgICBlcnJvck1lc3NhZ2UgPSBlcnJvci5nZXQoKS51c2VySW5mb1tO U0xvY2FsaXplZERlc2NyaXB0aW9uS2V5XTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IGV4Y2VwdGlvbkNvZGUgPSBOb3RBbGxvd2VkRXJyb3I7CiAKLSAgICBhdXRvIGNvbXBsZXRpb25I YW5kbGVyID0gbWFrZUJsb2NrUHRyKFtoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKV0oaWQgPEFT Q0NyZWRlbnRpYWxQcm90b2NvbD4gY3JlZGVudGlhbCwgTlNFcnJvciAqZXJyb3IpIG11dGFibGUg ewotICAgICAgICBlbnN1cmVPbk1haW5SdW5Mb29wKFtoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVy KSwgY3JlZGVudGlhbCA9IHJldGFpblB0cihjcmVkZW50aWFsKSwgZXJyb3IgPSByZXRhaW5QdHIo ZXJyb3IpXSAoKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIEF1dGhlbnRpY2F0b3JSZXNwb25zZURh dGEgcmVzcG9uc2U7Ci0gICAgICAgICAgICBBdXRoZW50aWNhdG9yQXR0YWNobWVudCBhdHRhY2ht ZW50OwotICAgICAgICAgICAgRXhjZXB0aW9uRGF0YSBleGNlcHRpb25EYXRhOwotCi0gICAgICAg ICAgICBpZiAoW2NyZWRlbnRpYWwgaXNLaW5kT2ZDbGFzczpnZXRBU0NQbGF0Zm9ybVB1YmxpY0tl eUNyZWRlbnRpYWxSZWdpc3RyYXRpb25DbGFzcygpXSkgewotICAgICAgICAgICAgICAgIGF0dGFj aG1lbnQgPSBBdXRoZW50aWNhdG9yQXR0YWNobWVudDo6UGxhdGZvcm07Ci0gICAgICAgICAgICAg ICAgcmVzcG9uc2UuaXNBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSA9IHRydWU7Ci0K LSAgICAgICAgICAgICAgICBBU0NQbGF0Zm9ybVB1YmxpY0tleUNyZWRlbnRpYWxSZWdpc3RyYXRp b24gKnJlZ2lzdHJhdGlvbkNyZWRlbnRpYWwgPSBjcmVkZW50aWFsLmdldCgpOwotICAgICAgICAg ICAgICAgIHJlc3BvbnNlLnJhd0lkID0gdG9BcnJheUJ1ZmZlcihyZWdpc3RyYXRpb25DcmVkZW50 aWFsLmNyZWRlbnRpYWxJRCk7Ci0gICAgICAgICAgICAgICAgcmVzcG9uc2UuYXR0ZXN0YXRpb25P YmplY3QgPSB0b0FycmF5QnVmZmVyKHJlZ2lzdHJhdGlvbkNyZWRlbnRpYWwuYXR0ZXN0YXRpb25P YmplY3QpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChbY3JlZGVudGlhbCBpc0tpbmRPZkNsYXNz OmdldEFTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3JlZGVudGlhbFJlZ2lzdHJhdGlvbkNsYXNzKCld KSB7Ci0gICAgICAgICAgICAgICAgYXR0YWNobWVudCA9IEF1dGhlbnRpY2F0b3JBdHRhY2htZW50 OjpDcm9zc1BsYXRmb3JtOwotICAgICAgICAgICAgICAgIHJlc3BvbnNlLmlzQXV0aGVudGljYXRv ckF0dGVzdGF0aW9uUmVzcG9uc2UgPSB0cnVlOwotCi0gICAgICAgICAgICAgICAgQVNDU2VjdXJp dHlLZXlQdWJsaWNLZXlDcmVkZW50aWFsUmVnaXN0cmF0aW9uICpyZWdpc3RyYXRpb25DcmVkZW50 aWFsID0gY3JlZGVudGlhbC5nZXQoKTsKLSAgICAgICAgICAgICAgICByZXNwb25zZS5yYXdJZCA9 IHRvQXJyYXlCdWZmZXIocmVnaXN0cmF0aW9uQ3JlZGVudGlhbC5jcmVkZW50aWFsSUQpOwotICAg ICAgICAgICAgICAgIHJlc3BvbnNlLmF0dGVzdGF0aW9uT2JqZWN0ID0gdG9BcnJheUJ1ZmZlcihy ZWdpc3RyYXRpb25DcmVkZW50aWFsLmF0dGVzdGF0aW9uT2JqZWN0KTsKLSAgICAgICAgICAgIH0g ZWxzZSBpZiAoW2NyZWRlbnRpYWwgaXNLaW5kT2ZDbGFzczpnZXRBU0NQbGF0Zm9ybVB1YmxpY0tl eUNyZWRlbnRpYWxBc3NlcnRpb25DbGFzcygpXSkgewotICAgICAgICAgICAgICAgIGF0dGFjaG1l bnQgPSBBdXRoZW50aWNhdG9yQXR0YWNobWVudDo6UGxhdGZvcm07Ci0gICAgICAgICAgICAgICAg cmVzcG9uc2UuaXNBdXRoZW50aWNhdG9yQXR0ZXN0YXRpb25SZXNwb25zZSA9IGZhbHNlOwotCi0g ICAgICAgICAgICAgICAgQVNDUGxhdGZvcm1QdWJsaWNLZXlDcmVkZW50aWFsQXNzZXJ0aW9uICph c3NlcnRpb25DcmVkZW50aWFsID0gY3JlZGVudGlhbC5nZXQoKTsKLSAgICAgICAgICAgICAgICBy ZXNwb25zZS5yYXdJZCA9IHRvQXJyYXlCdWZmZXIoYXNzZXJ0aW9uQ3JlZGVudGlhbC5jcmVkZW50 aWFsSUQpOwotICAgICAgICAgICAgICAgIHJlc3BvbnNlLmF1dGhlbnRpY2F0b3JEYXRhID0gdG9B cnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLmF1dGhlbnRpY2F0b3JEYXRhKTsKLSAgICAg ICAgICAgICAgICByZXNwb25zZS5zaWduYXR1cmUgPSB0b0FycmF5QnVmZmVyKGFzc2VydGlvbkNy ZWRlbnRpYWwuc2lnbmF0dXJlKTsKLSAgICAgICAgICAgICAgICByZXNwb25zZS51c2VySGFuZGxl ID0gdG9BcnJheUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLnVzZXJIYW5kbGUpOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChbY3JlZGVudGlhbCBpc0tpbmRPZkNsYXNzOmdldEFTQ1NlY3VyaXR5 S2V5UHVibGljS2V5Q3JlZGVudGlhbEFzc2VydGlvbkNsYXNzKCldKSB7Ci0gICAgICAgICAgICAg ICAgYXR0YWNobWVudCA9IEF1dGhlbnRpY2F0b3JBdHRhY2htZW50OjpDcm9zc1BsYXRmb3JtOwot ICAgICAgICAgICAgICAgIHJlc3BvbnNlLmlzQXV0aGVudGljYXRvckF0dGVzdGF0aW9uUmVzcG9u c2UgPSBmYWxzZTsKLQotICAgICAgICAgICAgICAgIEFTQ1NlY3VyaXR5S2V5UHVibGljS2V5Q3Jl ZGVudGlhbEFzc2VydGlvbiAqYXNzZXJ0aW9uQ3JlZGVudGlhbCA9IGNyZWRlbnRpYWwuZ2V0KCk7 Ci0gICAgICAgICAgICAgICAgcmVzcG9uc2UucmF3SWQgPSB0b0FycmF5QnVmZmVyKGFzc2VydGlv bkNyZWRlbnRpYWwuY3JlZGVudGlhbElEKTsKLSAgICAgICAgICAgICAgICByZXNwb25zZS5hdXRo ZW50aWNhdG9yRGF0YSA9IHRvQXJyYXlCdWZmZXIoYXNzZXJ0aW9uQ3JlZGVudGlhbC5hdXRoZW50 aWNhdG9yRGF0YSk7Ci0gICAgICAgICAgICAgICAgcmVzcG9uc2Uuc2lnbmF0dXJlID0gdG9BcnJh eUJ1ZmZlcihhc3NlcnRpb25DcmVkZW50aWFsLnNpZ25hdHVyZSk7Ci0gICAgICAgICAgICAgICAg cmVzcG9uc2UudXNlckhhbmRsZSA9IHRvQXJyYXlCdWZmZXIoYXNzZXJ0aW9uQ3JlZGVudGlhbC51 c2VySGFuZGxlKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgYXR0YWNo bWVudCA9IChBdXRoZW50aWNhdG9yQXR0YWNobWVudCkgMDsKLSAgICAgICAgICAgICAgICBFeGNl cHRpb25Db2RlIGV4Y2VwdGlvbkNvZGU7Ci0gICAgICAgICAgICAgICAgTlNTdHJpbmcgKmVycm9y TWVzc2FnZSA9IG5pbDsKLSAgICAgICAgICAgICAgICBpZiAoW2Vycm9yLmdldCgpLmRvbWFpbiBp c0VxdWFsVG9TdHJpbmc6V0tFcnJvckRvbWFpbl0pIHsKLSAgICAgICAgICAgICAgICAgICAgZXhj ZXB0aW9uQ29kZSA9IHRvRXhjZXB0aW9uQ29kZShlcnJvci5nZXQoKS5jb2RlKTsKLSAgICAgICAg ICAgICAgICAgICAgZXJyb3JNZXNzYWdlID0gZXJyb3IuZ2V0KCkudXNlckluZm9bTlNMb2NhbGl6 ZWREZXNjcmlwdGlvbktleV07Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg ICAgICAgICAgZXhjZXB0aW9uQ29kZSA9IE5vdEFsbG93ZWRFcnJvcjsKLQotICAgICAgICAgICAg ICAgICAgICBpZiAoW2Vycm9yLmdldCgpLmRvbWFpbiBpc0VxdWFsVG9TdHJpbmc6QVNDQXV0aG9y aXphdGlvbkVycm9yRG9tYWluXSAmJiBlcnJvci5nZXQoKS5jb2RlID09IEFTQ0F1dGhvcml6YXRp b25FcnJvclVzZXJDYW5jZWxlZCkKLSAgICAgICAgICAgICAgICAgICAgICAgIGVycm9yTWVzc2Fn ZSA9IEAiVGhpcyByZXF1ZXN0IGhhcyBiZWVuIGNhbmNlbGxlZCBieSB0aGUgdXNlci4iOwotICAg ICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBlcnJvck1lc3Nh Z2UgPSBAIk9wZXJhdGlvbiBmYWlsZWQuIjsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICBpZiAoW2Vycm9yLmdldCgpLmRvbWFpbiBpc0VxdWFsVG9TdHJpbmc6QVNDQXV0aG9yaXphdGlv bkVycm9yRG9tYWluXSAmJiBlcnJvci5nZXQoKS5jb2RlID09IEFTQ0F1dGhvcml6YXRpb25FcnJv clVzZXJDYW5jZWxlZCkKKyAgICAgICAgICAgICAgICBlcnJvck1lc3NhZ2UgPSBAIlRoaXMgcmVx dWVzdCBoYXMgYmVlbiBjYW5jZWxsZWQgYnkgdGhlIHVzZXIuIjsKKyAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICBlcnJvck1lc3NhZ2UgPSBAIk9wZXJhdGlvbiBmYWlsZWQuIjsKKyAg ICAgICAgfQogCi0gICAgICAgICAgICAgICAgZXhjZXB0aW9uRGF0YSA9IHsgZXhjZXB0aW9uQ29k ZSwgZXJyb3JNZXNzYWdlIH07Ci0gICAgICAgICAgICB9CisgICAgICAgIGV4Y2VwdGlvbkRhdGEg PSB7IGV4Y2VwdGlvbkNvZGUsIGVycm9yTWVzc2FnZSB9OworICAgIH0KIAotICAgICAgICAgICAg aGFuZGxlcihyZXNwb25zZSwgYXR0YWNobWVudCwgZXhjZXB0aW9uRGF0YSk7Ci0gICAgICAgIH0p OwotICAgIH0pOwotICAgIAorICAgIGhhbmRsZXIocmVzcG9uc2UsIGF0dGFjaG1lbnQsIGV4Y2Vw dGlvbkRhdGEpOworfQorCit2b2lkIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5Ojpw ZXJmb3JtUmVxdWVzdChSZXRhaW5QdHI8QVNDQ3JlZGVudGlhbFJlcXVlc3RDb250ZXh0PiByZXF1 ZXN0Q29udGV4dCwgUmVxdWVzdENvbXBsZXRpb25IYW5kbGVyJiYgaGFuZGxlcikKK3sKKyAgICBh dXRvIHByb3h5ID0gYWRvcHROUyhbYWxsb2NBU0NBZ2VudFByb3h5SW5zdGFuY2UoKSBpbml0XSk7 CiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShNQUNDQVRBTFlTVCkKICAgICBpZiAoW3Jl cXVlc3RDb250ZXh0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IocmVxdWVzdFN0eWxlKV0g JiYgcmVxdWVzdENvbnRleHQuZ2V0KCkucmVxdWVzdFN0eWxlID09IEFTQ3JlZGVudGlhbFJlcXVl c3RTdHlsZUF1dG9GaWxsKSB7Ci0gICAgICAgIFtwcm94eSBwZXJmb3JtQXV0b0ZpbGxBdXRob3Jp emF0aW9uUmVxdWVzdHNGb3JDb250ZXh0OnJlcXVlc3RDb250ZXh0LmdldCgpIHdpdGhDb21wbGV0 aW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoW3Byb3h5ID0gV1RGTW92ZShwcm94eSksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKGlkIDxBU0NDcmVkZW50aWFs UHJvdG9jb2w+IGNyZWRlbnRpYWwsIE5TRXJyb3IgKmVycm9yKSBtdXRhYmxlIHsKLSAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKGNyZWRlbnRpYWwsIGVycm9yKTsKKyAgICAgICAgW3Byb3h5 IHBlcmZvcm1BdXRvRmlsbEF1dGhvcml6YXRpb25SZXF1ZXN0c0ZvckNvbnRleHQ6cmVxdWVzdENv bnRleHQuZ2V0KCkgd2l0aENvbXBsZXRpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihbd2Vha1RoaXMg PSBXZWFrUHRyIHsgKnRoaXMgfSwgcHJveHkgPSBXVEZNb3ZlKHByb3h5KSwgaGFuZGxlciA9IFdU Rk1vdmUoaGFuZGxlcildKGlkIDxBU0NDcmVkZW50aWFsUHJvdG9jb2w+IGNyZWRlbnRpYWwsIE5T RXJyb3IgKmVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGVuc3VyZU9uTWFpblJ1bkxvb3Ao W3dlYWtUaGlzLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwgcHJveHkgPSBXVEZNb3ZlKHBy b3h5KSwgY3JlZGVudGlhbCA9IHJldGFpblB0cihjcmVkZW50aWFsKSwgZXJyb3IgPSByZXRhaW5Q dHIoZXJyb3IpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKSB7 CisgICAgICAgICAgICAgICAgICAgIGhhbmRsZXIoeyB9LCAoQXV0aGVudGljYXRvckF0dGFjaG1l bnQpMCwgRXhjZXB0aW9uRGF0YSB7IE5vdEFsbG93ZWRFcnJvciwgIk9wZXJhdGlvbiBmYWlsZWQu IiB9KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBjb250aW51ZUFmdGVyUmVxdWVzdChjcmVkZW50aWFsLCBlcnJvciwgV1RG TW92ZShoYW5kbGVyKSk7CisgICAgICAgICAgICB9KTsKICAgICAgICAgfSkuZ2V0KCldOwogICAg ICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0o TUFDQ0FUQUxZU1QpCi0gICAgCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIFtwcm94eSBwZXJmb3Jt QXV0aG9yaXphdGlvblJlcXVlc3RzRm9yQ29udGV4dDpyZXF1ZXN0Q29udGV4dC5nZXQoKSB3aXRo Q29tcGxldGlvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFtwcm94eSA9IFdURk1vdmUocHJveHkpLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShpZCA8QVNDQ3Jl ZGVudGlhbFByb3RvY29sPiBjcmVkZW50aWFsLCBOU0Vycm9yICplcnJvcikgbXV0YWJsZSB7Ci0g ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGNyZWRlbnRpYWwsIGVycm9yKTsKLSAgICB9KS5nZXQo KV07CisgICAgW3Byb3h5IHBlcmZvcm1BdXRob3JpemF0aW9uUmVxdWVzdHNGb3JDb250ZXh0OnJl cXVlc3RDb250ZXh0LmdldCgpIHdpdGhDb21wbGV0aW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoW2hh bmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpLCBwcm94eSA9IFdURk1vdmUocHJveHkpXShpZCA8QVND Q3JlZGVudGlhbFByb3RvY29sPiBjcmVkZW50aWFsLCBOU0Vycm9yICplcnJvcikgbXV0YWJsZSB7 CisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFtoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKSwg cHJveHkgPSBXVEZNb3ZlKHByb3h5KSwgY3JlZGVudGlhbCA9IHJldGFpblB0cihjcmVkZW50aWFs KSwgZXJyb3IgPSByZXRhaW5QdHIoZXJyb3IpXSAoKSBtdXRhYmxlIHsKICNlbGlmIFBMQVRGT1JN KE1BQykKICAgICBSZXRhaW5QdHI8TlNXaW5kb3c+IHdpbmRvdyA9IG1fd2ViUGFnZVByb3h5LnBs YXRmb3JtV2luZG93KCk7Ci0gICAgW3Byb3h5IHBlcmZvcm1BdXRob3JpemF0aW9uUmVxdWVzdHNG b3JDb250ZXh0OnJlcXVlc3RDb250ZXh0LmdldCgpIHdpdGhDbGVhcmFuY2VIYW5kbGVyOm1ha2VC bG9ja1B0cihbd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgd2luZG93ID0gV1RGTW92ZSh3aW5kb3cpLCBw cm94eSA9IFdURk1vdmUocHJveHkpXShOU1hQQ0xpc3RlbmVyRW5kcG9pbnQgKmRhZW1vbkVuZHBv aW50LCBOU0Vycm9yICplcnJvcikgbXV0YWJsZSB7Ci0gICAgICAgIGNhbGxPbk1haW5SdW5Mb29w KFt3ZWFrVGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KSwgd2luZG93ID0gV1RGTW92ZSh3aW5kb3cpLCBwcm94eSA9IFdURk1vdmUocHJveHkpLCBkYWVt b25FbmRwb2ludCA9IHJldGFpblB0cihkYWVtb25FbmRwb2ludCksIGVycm9yID0gcmV0YWluUHRy KGVycm9yKV0gKCkgbXV0YWJsZSB7CisgICAgW3Byb3h5IHBlcmZvcm1BdXRob3JpemF0aW9uUmVx dWVzdHNGb3JDb250ZXh0OnJlcXVlc3RDb250ZXh0LmdldCgpIHdpdGhDbGVhcmFuY2VIYW5kbGVy Om1ha2VCbG9ja1B0cihbd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgaGFuZGxlciA9IFdU Rk1vdmUoaGFuZGxlciksIHdpbmRvdyA9IFdURk1vdmUod2luZG93KSwgcHJveHkgPSBXVEZNb3Zl KHByb3h5KV0oTlNYUENMaXN0ZW5lckVuZHBvaW50ICpkYWVtb25FbmRwb2ludCwgTlNFcnJvciAq ZXJyb3IpIG11dGFibGUgeworICAgICAgICBjYWxsT25NYWluUnVuTG9vcChbd2Vha1RoaXMsIGhh bmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpLCB3aW5kb3cgPSBXVEZNb3ZlKHdpbmRvdyksIHByb3h5 ID0gV1RGTW92ZShwcm94eSksIGRhZW1vbkVuZHBvaW50ID0gcmV0YWluUHRyKGRhZW1vbkVuZHBv aW50KSwgZXJyb3IgPSByZXRhaW5QdHIoZXJyb3IpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAg IGlmICghd2Vha1RoaXMgfHwgIWRhZW1vbkVuZHBvaW50KSB7CiAgICAgICAgICAgICAgICAgTE9H X0VSUk9SKCJDb3VsZCBub3QgY29ubmVjdCB0byBhdXRob3JpemF0aW9uIGRhZW1vbjogJUBcbiIs IGVycm9yLmdldCgpKTsKLSAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0sIGVy cm9yLmdldCgpKTsKKyAgICAgICAgICAgICAgICBoYW5kbGVyKHsgfSwgKEF1dGhlbnRpY2F0b3JB dHRhY2htZW50KTAsIEV4Y2VwdGlvbkRhdGEgeyBOb3RBbGxvd2VkRXJyb3IsICJPcGVyYXRpb24g ZmFpbGVkLiIgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICB3ZWFrVGhpcy0+bV9wcmVzZW50ZXIgPSBhZG9wdE5TKFthbGxvY0FTQ0F1dGhv cml6YXRpb25SZW1vdGVQcmVzZW50ZXJJbnN0YW5jZSgpIGluaXRdKTsKLSAgICAgICAgICAgIFt3 ZWFrVGhpcy0+bV9wcmVzZW50ZXIgcHJlc2VudFdpdGhXaW5kb3c6d2luZG93LmdldCgpIGRhZW1v bkVuZHBvaW50OmRhZW1vbkVuZHBvaW50LmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOm1ha2VCbG9j a1B0cihbcHJveHkgPSBXVEZNb3ZlKHByb3h5KSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oaWQgPEFTQ0NyZWRlbnRpYWxQcm90b2NvbD4gY3JlZGVudGlh bCwgTlNFcnJvciAqZXJyb3IpIG11dGFibGUgewotICAgICAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKGNyZWRlbnRpYWwsIGVycm9yKTsKKyAgICAgICAgICAgIFt3ZWFrVGhpcy0+bV9wcmVz ZW50ZXIgcHJlc2VudFdpdGhXaW5kb3c6d2luZG93LmdldCgpIGRhZW1vbkVuZHBvaW50OmRhZW1v bkVuZHBvaW50LmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihbaGFuZGxlciA9 IFdURk1vdmUoaGFuZGxlciksIHByb3h5ID0gV1RGTW92ZShwcm94eSldKGlkIDxBU0NDcmVkZW50 aWFsUHJvdG9jb2w+IGNyZWRlbnRpYWxOb3RSZXRhaW4sIE5TRXJyb3IgKmVycm9yTm90UmV0YWlu KSBtdXRhYmxlIHsKKyAgICAgICAgICAgICAgICBhdXRvIGNyZWRlbnRpYWwgPSByZXRhaW5QdHIo Y3JlZGVudGlhbE5vdFJldGFpbik7CisgICAgICAgICAgICAgICAgYXV0byBlcnJvciA9IHJldGFp blB0cihlcnJvck5vdFJldGFpbik7CisjZW5kaWYKKyAgICAgICAgICAgICAgICBjb250aW51ZUFm dGVyUmVxdWVzdChjcmVkZW50aWFsLCBlcnJvciwgV1RGTW92ZShoYW5kbGVyKSk7CisjaWYgUExB VEZPUk0oTUFDKQogICAgICAgICAgICAgfSkuZ2V0KCldOworI2VuZGlmCiAgICAgICAgIH0pOwog ICAgIH0pLmdldCgpXTsKLSNlbmRpZiAvLyBQTEFURk9STShNQUMpCiB9CiAKIHZvaWQgV2ViQXV0 aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHk6OmlzQ29uZGl0aW9uYWxNZWRpYXRpb25BdmFpbGFi bGUoUXVlcnlDb21wbGV0aW9uSGFuZGxlciYmIGhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRp bmF0b3JQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkuaAppbmRleCAzOWM4M2NjYWJmYjBmYmQz ZGIyZjZhYTIwZDFlYmU1NWNiNGE3NWFlLi44Zjg3YzAzMDY4YTQwN2JiNjViNGY5ZTFmNjExNGY0 ZDcwNmQzNDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50 aWNhdGlvbi9XZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL1dlYkF1dGhlbnRpY2F0b3JDb29yZGlu YXRvclByb3h5LmgKQEAgLTU0LDYgKzU0LDggQEAgY2xhc3MgV2ViUGFnZVByb3h5Owogc3RydWN0 IEZyYW1lSW5mb0RhdGE7CiBzdHJ1Y3QgV2ViQXV0aGVudGljYXRpb25SZXF1ZXN0RGF0YTsKIAor dXNpbmcgUmVxdWVzdENvbXBsZXRpb25IYW5kbGVyID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChj b25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdG9yUmVzcG9uc2VEYXRhJiwgV2ViQ29yZTo6QXV0aGVu dGljYXRvckF0dGFjaG1lbnQsIGNvbnN0IFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGEmKT47CisKIGNs YXNzIFdlYkF1dGhlbnRpY2F0b3JDb29yZGluYXRvclByb3h5IDogcHVibGljIElQQzo6TWVzc2Fn ZVJlY2VpdmVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKICAgICBXVEZfTUFLRV9O T05DT1BZQUJMRShXZWJBdXRoZW50aWNhdG9yQ29vcmRpbmF0b3JQcm94eSk7CkBAIC02Miw3ICs2 NCw2IEBAIHB1YmxpYzoKICAgICB+V2ViQXV0aGVudGljYXRvckNvb3JkaW5hdG9yUHJveHkoKTsK IAogcHJpdmF0ZToKLSAgICB1c2luZyBSZXF1ZXN0Q29tcGxldGlvbkhhbmRsZXIgPSBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0b3JSZXNwb25zZURhdGEm LCBXZWJDb3JlOjpBdXRoZW50aWNhdG9yQXR0YWNobWVudCwgY29uc3QgV2ViQ29yZTo6RXhjZXB0 aW9uRGF0YSYpPjsKICAgICB1c2luZyBRdWVyeUNvbXBsZXRpb25IYW5kbGVyID0gQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT47CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlci4K