231617 2021-10-12 14:18:20 -0700 Reduce use of WebCore structures in adattributiond 2021-10-12 15:49:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1803377 0 achristensen 2021-10-12 14:18:20 -0700 Reduce use of WebCore structures in adattributiond 1803378 1 440981 achristensen 2021-10-12 14:20:37 -0700 Created attachment 440981 Patch 1803403 2 440986 achristensen 2021-10-12 14:39:46 -0700 Created attachment 440986 Patch 1803495 3 ews-feeder 2021-10-12 15:48:29 -0700 Committed r284051 (242880@main): <https://commits.webkit.org/242880@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440986. 1803497 4 webkit-bug-importer 2021-10-12 15:49:14 -0700 <rdar://problem/84170212> 440981 2021-10-12 14:20:37 -0700 2021-10-12 14:39:44 -0700 Patch bug-231617-20211012152036.patch text/plain 12376 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlkZDBkODJlY2I3YzIxMTU5 ODk2OTI2ZWQwMjA0ZmE2NzI5NjJlYWQuLmMzZmU1MzM3OGFjZWY3YTM0ZjU5ZmQxODdmYzBhMDJi ZTNmNmVkNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMTAtMTIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZWR1Y2UgdXNl IG9mIFdlYkNvcmUgc3RydWN0dXJlcyBpbiBhZGF0dHJpYnV0aW9uZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcmVkdWNlIHRoZSBt ZW1vcnkgdXNlIG9mIGFkYXR0cmlidXRpb25kLCBJJ20gcGxhbm5pbmcgdG8gaGF2ZSBpdCBub3Qg bGluayBXZWJLaXQuZnJhbWV3b3JrLgorICAgICAgICBUaGlzIGlzIHByb2dyZXNzIHRvd2FyZHMg dGhhdC4KKyAgICAgICAgSSB1c2UgYSBSdW5Mb29wOjpUaW1lciBpbnN0ZWFkIG9mIGEgV2ViQ29y ZTo6VGltZXIsIHdoaWNoIGRvZXMgdGhlIHNhbWUgdGhpbmcgb24gdGhlIG1haW4gdGhyZWFkLgor ICAgICAgICBJIHVzZSBhIFdURjo6U3RyaW5nIHRvIHJlcHJlc2VudCB0aGUgZXJyb3IgZGVzY3Jp cHRpb24gb3IgbGFjayB0aGVyZW9mIGluc3RlYWQgb2Ygc2VuZGluZyB0aGUgd2hvbGUgZXJyb3Iu CisgICAgICAgIEkgc3RvcCBzZW5kaW5nIHRoZSByZXNwb25zZSwgYmVjYXVzZSBpdCB3YXMgdW51 c2VkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXIpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Omdl dFRva2VuUHVibGljS2V5KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRNYW5hZ2VyOjpnZXRTaWduZWRVbmxpbmthYmxlVG9rZW4pOgorICAgICAgICAoV2ViS2l0OjpQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJL aXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmlyZUNvbnZlcnNpb25SZXF1ZXN0 SW1wbCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3Jr TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UENNOjpOZXR3b3JrTG9hZGVyOjpzdGFydCk6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvY29jb2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRO ZXR3b3JrTG9hZGVyQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OlBDTTo6TmV0d29ya0xvYWRl cjo6c3RhcnQpOgorCiAyMDIxLTEwLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEhhdmUgdGhlIFNjcm9sbGluZ1RyZWUgdHJhY2sgbm9kZXMgd2l0 aCBhbmltYXRlZCBzY3JvbGxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVt ZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKaW5kZXggYzVlZGRkZjE4ZjJk YTJkZjU2ZWQ4ZmRjZjk3YjJmY2Q1Mjk1YzBkZS4uYzQyYjIwZDVhNGYyMjk3NzBkZDQwMDBkYTdj NTQzMWFkNmFjNjNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApAQCAtNTQsNyArNTQsNyBAQCB1 c2luZyBFcGhlbWVyYWxTb3VyY2VOb25jZSA9IFByaXZhdGVDbGlja01lYXN1cmVtZW50OjpFcGhl bWVyYWxTb3VyY2VOb25jZTsKIGNvbnN0ZXhwciBTZWNvbmRzIGRlYnVnTW9kZVNlY29uZHNVbnRp bFNlbmQgeyAxMF9zIH07CiAKIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6UHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyKFVuaXF1ZVJlZjxQQ006OkNsaWVudD4mJiBjbGllbnQs IGNvbnN0IFN0cmluZyYgc3RvcmFnZURpcmVjdG9yeSkKLSAgICA6IG1fZmlyZVBlbmRpbmdBdHRy aWJ1dGlvblJlcXVlc3RzVGltZXIoKnRoaXMsICZQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXI6OmZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0cykKKyAgICA6IG1fZmlyZVBlbmRpbmdB dHRyaWJ1dGlvblJlcXVlc3RzVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMpCiAg ICAgLCBtX3N0b3JhZ2VEaXJlY3Rvcnkoc3RvcmFnZURpcmVjdG9yeSkKICAgICAsIG1fY2xpZW50 KFdURk1vdmUoY2xpZW50KSkKIHsKQEAgLTEzNiwxMiArMTM2LDEyIEBAIHZvaWQgUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpnZXRUb2tlblB1YmxpY0tleShQcml2YXRlQ2xpY2tNZWFz dXJlbWVudCYmCiAgICAgUkVMRUFTRV9MT0dfSU5GTyhQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwg IkFib3V0IHRvIGZpcmUgYSB0b2tlbiBwdWJsaWMga2V5IHJlcXVlc3QuIik7CiAgICAgbV9jbGll bnQtPmJyb2FkY2FzdENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VMZXZlbDo6TG9nLCAiW1ByaXZhdGUg Q2xpY2sgTWVhc3VyZW1lbnRdIEFib3V0IHRvIGZpcmUgYSB0b2tlbiBwdWJsaWMga2V5IHJlcXVl c3QuIl9zKTsKIAotICAgIFBDTTo6TmV0d29ya0xvYWRlcjo6c3RhcnQoV1RGTW92ZSh0b2tlblB1 YmxpY0tleVVSTCksIG51bGxwdHIsIHBjbURhdGFDYXJyaWVkLCBbd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cigqdGhpcyksIHRoaXMsIGF0dHJpYnV0aW9uID0gV1RGTW92ZShhdHRyaWJ1dGlvbiksIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIChhdXRvJiBlcnJvciwgYXV0byYgcmVzcG9uc2Us IGF1dG8mIGpzb25PYmplY3QpIG11dGFibGUgeworICAgIFBDTTo6TmV0d29ya0xvYWRlcjo6c3Rh cnQoV1RGTW92ZSh0b2tlblB1YmxpY0tleVVSTCksIG51bGxwdHIsIHBjbURhdGFDYXJyaWVkLCBb d2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHRoaXMsIGF0dHJpYnV0aW9uID0gV1RGTW92 ZShhdHRyaWJ1dGlvbiksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIChhdXRvJiBlcnJv ckRlc2NyaXB0aW9uLCBhdXRvJiBqc29uT2JqZWN0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3 ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIWVycm9yLmlzTnVs bCgpKSB7Ci0gICAgICAgICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVz c2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRd IFJlY2VpdmVkIGVycm9yOiAnIl9zLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLCAiJyBm b3IgdG9rZW4gcHVibGljIGtleSByZXF1ZXN0LiJfcykpOworICAgICAgICBpZiAoIWVycm9yRGVz Y3JpcHRpb24uaXNOdWxsKCkpIHsKKyAgICAgICAgICAgIG1fY2xpZW50LT5icm9hZGNhc3RDb25z b2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5nKCJbUHJpdmF0ZSBDbGlj ayBNZWFzdXJlbWVudF0gUmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9yRGVzY3JpcHRpb24sICIn IGZvciB0b2tlbiBwdWJsaWMga2V5IHJlcXVlc3QuIl9zKSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KIApAQCAtMTc5LDEyICsxNzksMTIgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OmdldFNpZ25lZFVubGlua2FibGVUb2tlbihQcml2YXRlQ2xpY2tNZWFz dXIKICAgICBSRUxFQVNFX0xPR19JTkZPKFByaXZhdGVDbGlja01lYXN1cmVtZW50LCAiQWJvdXQg dG8gZmlyZSBhIHVubGlua2FibGUgdG9rZW4gc2lnbmluZyByZXF1ZXN0LiIpOwogICAgIG1fY2xp ZW50LT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6OkxvZywgIltQcml2YXRl IENsaWNrIE1lYXN1cmVtZW50XSBBYm91dCB0byBmaXJlIGEgdW5saW5rYWJsZSB0b2tlbiBzaWdu aW5nIHJlcXVlc3QuIl9zKTsKIAotICAgIFBDTTo6TmV0d29ya0xvYWRlcjo6c3RhcnQoV1RGTW92 ZSh0b2tlblNpZ25hdHVyZVVSTCksIG1lYXN1cmVtZW50LnRva2VuU2lnbmF0dXJlSlNPTigpLCBw Y21EYXRhQ2FycmllZCwgW3dlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCB0aGlzLCBtZWFz dXJlbWVudCA9IFdURk1vdmUobWVhc3VyZW1lbnQpXSAoYXV0byYgZXJyb3IsIGF1dG8mIHJlc3Bv bnNlLCBhdXRvJiBqc29uT2JqZWN0KSBtdXRhYmxlIHsKKyAgICBQQ006Ok5ldHdvcmtMb2FkZXI6 OnN0YXJ0KFdURk1vdmUodG9rZW5TaWduYXR1cmVVUkwpLCBtZWFzdXJlbWVudC50b2tlblNpZ25h dHVyZUpTT04oKSwgcGNtRGF0YUNhcnJpZWQsIFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlz KSwgdGhpcywgbWVhc3VyZW1lbnQgPSBXVEZNb3ZlKG1lYXN1cmVtZW50KV0gKGF1dG8mIGVycm9y RGVzY3JpcHRpb24sIGF1dG8mIGpzb25PYmplY3QpIG11dGFibGUgewogICAgICAgICBpZiAoIXdl YWtUaGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghZXJyb3IuaXNOdWxs KCkpIHsKLSAgICAgICAgICAgIG1fY2xpZW50LT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShNZXNz YWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5nKCJbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0g UmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCksICInIGZv ciBzZWNyZXQgdG9rZW4gc2lnbmluZyByZXF1ZXN0LiJfcykpOworICAgICAgICBpZiAoIWVycm9y RGVzY3JpcHRpb24uaXNOdWxsKCkpIHsKKyAgICAgICAgICAgIG1fY2xpZW50LT5icm9hZGNhc3RD b25zb2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5nKCJbUHJpdmF0ZSBD bGljayBNZWFzdXJlbWVudF0gUmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9yRGVzY3JpcHRpb24s ICInIGZvciBzZWNyZXQgdG9rZW4gc2lnbmluZyByZXF1ZXN0LiJfcykpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKQEAgLTMwMCw3ICszMDAsNyBAQCB2b2lkIFByaXZhdGVDbGlj a01lYXN1cmVtZW50TWFuYWdlcjo6YXR0cmlidXRlKGNvbnN0IFNvdXJjZVNpdGUmIHNvdXJjZVNp dGUsIGNvbgogICAgICAgICAgICAgaWYgKCFtaW5TZWNvbmRzVW50aWxTZW5kKQogICAgICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYgKG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlv blJlcXVlc3RzVGltZXIuaXNBY3RpdmUoKSAmJiBtX2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1 ZXN0c1RpbWVyLm5leHRGaXJlSW50ZXJ2YWwoKSA8ICptaW5TZWNvbmRzVW50aWxTZW5kKQorICAg ICAgICAgICAgaWYgKG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzVGltZXIuaXNBY3Rp dmUoKSAmJiBtX2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0c1RpbWVyLnNlY29uZHNVbnRp bEZpcmUoKSA8ICptaW5TZWNvbmRzVW50aWxTZW5kKQogICAgICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICAgICAgaWYgKFVOTElLRUxZKGRlYnVnTW9kZUVuYWJsZWQoKSkpIHsKQEAgLTM2 NSwxMiArMzY1LDEyIEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpmaXJl Q29udmVyc2lvblJlcXVlc3RJbXBsKGNvbnN0IFByaXZhdGVDbGljCiAgICAgUkVMRUFTRV9MT0df SU5GTyhQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCwgIkFib3V0IHRvIGZpcmUgYW4gYXR0cmlidXRp b24gcmVxdWVzdC4iKTsKICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVz c2FnZUxldmVsOjpMb2csICJbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0gQWJvdXQgdG8gZmly ZSBhbiBhdHRyaWJ1dGlvbiByZXF1ZXN0LiJfcyk7CiAKLSAgICBQQ006Ok5ldHdvcmtMb2FkZXI6 OnN0YXJ0KFdURk1vdmUoYXR0cmlidXRpb25VUkwpLCBhdHRyaWJ1dGlvbi5hdHRyaWJ1dGlvblJl cG9ydEpTT04oKSwgcGNtRGF0YUNhcnJpZWQsIFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlz KSwgdGhpc10oYXV0byYgZXJyb3IsIGF1dG8mIHJlc3BvbnNlLCBhdXRvJikgeworICAgIFBDTTo6 TmV0d29ya0xvYWRlcjo6c3RhcnQoV1RGTW92ZShhdHRyaWJ1dGlvblVSTCksIGF0dHJpYnV0aW9u LmF0dHJpYnV0aW9uUmVwb3J0SlNPTigpLCBwY21EYXRhQ2FycmllZCwgW3dlYWtUaGlzID0gbWFr ZVdlYWtQdHIoKnRoaXMpLCB0aGlzXShhdXRvJiBlcnJvckRlc2NyaXB0aW9uLCBhdXRvJikgewog ICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlm ICghZXJyb3IuaXNOdWxsKCkpCi0gICAgICAgICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29s ZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sg TWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAnIl9zLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlw dGlvbigpLCAiJyBmb3IgYWQgY2xpY2sgYXR0cmlidXRpb24gcmVxdWVzdC4iX3MpKTsKKyAgICAg ICAgaWYgKCFlcnJvckRlc2NyaXB0aW9uLmlzTnVsbCgpKQorICAgICAgICAgICAgbV9jbGllbnQt PmJyb2FkY2FzdENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1ha2VTdHJpbmco IltQcml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBSZWNlaXZlZCBlcnJvcjogJyJfcywgZXJyb3JE ZXNjcmlwdGlvbiwgIicgZm9yIGFkIGNsaWNrIGF0dHJpYnV0aW9uIHJlcXVlc3QuIl9zKSk7CiAg ICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZh dGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCmluZGV4IDFlM2EyOTI1MmViMmY4ODQxYmI0YTQ5 NWQxZDIzMWVjNGY4YTIzZjkuLjJlYzdlM2FmZGI0NjE1MGIwZjIyYzY4ZWZiMmNmODUzNzNlMDA2 MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmgKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXIuaApAQCAtODMsNyArODMsNyBAQCBwcml2YXRlOgogICAgIGJv b2wgZmVhdHVyZUVuYWJsZWQoKSBjb25zdDsKICAgICBib29sIGRlYnVnTW9kZUVuYWJsZWQoKSBj b25zdDsKIAotICAgIFdlYkNvcmU6OlRpbWVyIG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVl c3RzVGltZXI7CisgICAgUnVuTG9vcDo6VGltZXI8UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyPiBtX2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0c1RpbWVyOwogICAgIGJvb2wgbV9p c1J1bm5pbmdUZXN0IHsgZmFsc2UgfTsKICAgICBzdGQ6Om9wdGlvbmFsPFVSTD4gbV90b2tlblB1 YmxpY0tleVVSTEZvclRlc3Rpbmc7CiAgICAgc3RkOjpvcHRpb25hbDxVUkw+IG1fdG9rZW5TaWdu YXR1cmVVUkxGb3JUZXN0aW5nOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdv cmtMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtMb2FkZXIuY3BwCmluZGV4 IGJiMGU3NDFhNTJmZmVhYzNjYzg2NjhlMDlhNmZhMTJjZmNhM2I3ZTYuLjlkM2JhZjBhYWJiYzZk NWI1NDJhNjllNjgxNTFmNmYxOTBhMmYzYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnROZXR3b3JrTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRl ci5jcHAKQEAgLTM4LDcgKzM4LDcgQEAgbmFtZXNwYWNlIFBDTSB7CiB2b2lkIE5ldHdvcmtMb2Fk ZXI6OnN0YXJ0KFVSTCYmLCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmLCBXZWJDb3JlOjpQcml2YXRl Q2xpY2tNZWFzdXJlbWVudDo6UGNtRGF0YUNhcnJpZWQsIENhbGxiYWNrJiYgY29tcGxldGlvbkhh bmRsZXIpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICBjb21wbGV0aW9uSGFuZGxlcih7 IH0sIHsgfSwgeyB9KTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0sIHsgfSk7CiB9CiAKIHZv aWQgTmV0d29ya0xvYWRlcjo6YWxsb3dUTFNDZXJ0aWZpY2F0ZUNoYWluRm9yTG9jYWxQQ01UZXN0 aW5nKGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlj a01lYXN1cmVtZW50TmV0d29ya0xvYWRlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtM b2FkZXIuaAppbmRleCA2YTFkY2I1ZTFmNGMyOGJiNzg5OGM4YWM0NGM3MjM0ZTlkYzVhYTY4Li45 OWQ3YTBhNjUzN2JiYWJhYTE5NjBiZTM3ZTQzZmJmNWNjOTVhMDc1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVD bGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRO ZXR3b3JrTG9hZGVyLmgKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNwYWNlIFBDTSB7CiBjbGFzcyBO ZXR3b3JrTG9hZGVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAg ICB1c2luZyBDYWxsYmFjayA9IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBS ZWZQdHI8SlNPTjo6T2JqZWN0PiYpPjsKKyAgICB1c2luZyBDYWxsYmFjayA9IENvbXBsZXRpb25I YW5kbGVyPHZvaWQoY29uc3QgU3RyaW5nJiwgY29uc3QgUmVmUHRyPEpTT046Ok9iamVjdD4mKT47 CiAgICAgc3RhdGljIHZvaWQgc3RhcnQoVVJMJiYsIFJlZlB0cjxKU09OOjpPYmplY3Q+JiYsIFdl YkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpQY21EYXRhQ2FycmllZCwgQ2FsbGJhY2sm Jik7CiAgICAgc3RhdGljIHZvaWQgYWxsb3dUTFNDZXJ0aWZpY2F0ZUNoYWluRm9yTG9jYWxQQ01U ZXN0aW5nKGNvbnN0IFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyYpOwogfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvY29j b2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyQ29jb2EubW0gYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L2NvY29hL1ByaXZh dGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRlckNvY29hLm1tCmluZGV4IDRmNWExM2FjNmVi YjM4ZDZlNDA3MTRhZmNhOTY0MjBiMjViNDcxMDAuLmFjYTUzMWE5ZGU4OTJlN2ZkZTNmOGEyZjdk OWJlZjY3N2FiYjQxYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvY29jb2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3 b3JrTG9hZGVyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudC9jb2NvYS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtM b2FkZXJDb2NvYS5tbQpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgTmV0d29ya0xvYWRlcjo6c3Rh cnQoVVJMJiYgdXJsLCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmIGpzb25QYXlsb2FkLCBXZWJDb3Jl CiAgICAgLy8gUHJldmVudCBjb250YWN0aW5nIG5vbi1sb2NhbCBzZXJ2ZXJzIHdoZW4gYSB0ZXN0 IGNlcnRpZmljYXRlIGNoYWluIGlzIHVzZWQgZm9yIDEyNy4wLjAuMS4KICAgICAvLyBGSVhNRTog VXNlIGEgcHJveHkgc2VydmVyIHRvIGhhdmUgdGVzdHMgY292ZXIgdGhlIHJlcG9ydHMgc2VudCB0 byB0aGUgZGVzdGluYXRpb24sIHRvby4KICAgICBpZiAoYWxsb3dlZExvY2FsVGVzdFNlcnZlclRy dXN0KCkgJiYgdXJsLmhvc3QoKSAhPSAiMTI3LjAuMC4xIikKLSAgICAgICAgcmV0dXJuIGNhbGxi YWNrKHsgfSwgeyB9LCB7IH0pOworICAgICAgICByZXR1cm4gY2FsbGJhY2soeyB9LCB7IH0pOwog CiAgICAgYXV0byByZXF1ZXN0ID0gYWRvcHROUyhbW05TTXV0YWJsZVVSTFJlcXVlc3QgYWxsb2Nd IGluaXRXaXRoVVJMOnVybF0pOwogICAgIFtyZXF1ZXN0IHNldFZhbHVlOldlYkNvcmU6OkhUVFBI ZWFkZXJWYWx1ZXM6Om1heEFnZTAoKSBmb3JIVFRQSGVhZGVyRmllbGQ6QCJDYWNoZS1Db250cm9s Il07CkBAIC0xMjksMTAgKzEyOSwxMCBAQCB2b2lkIE5ldHdvcmtMb2FkZXI6OnN0YXJ0KFVSTCYm IHVybCwgUmVmUHRyPEpTT046Ok9iamVjdD4mJiBqc29uUGF5bG9hZCwgV2ViQ29yZQogICAgIE5T VVJMU2Vzc2lvbkRhdGFUYXNrICp0YXNrID0gW3N0YXRlbGVzc1Nlc3Npb25XaXRob3V0UmVkaXJl Y3RzKCkgZGF0YVRhc2tXaXRoUmVxdWVzdDpyZXF1ZXN0LmdldCgpIGNvbXBsZXRpb25IYW5kbGVy Om1ha2VCbG9ja1B0cihbY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKSwgaWRlbnRpZmllcl0o TlNEYXRhICpkYXRhLCBOU1VSTFJlc3BvbnNlICpyZXNwb25zZSwgTlNFcnJvciAqZXJyb3IpIG11 dGFibGUgewogICAgICAgICB0YXNrTWFwKCkucmVtb3ZlKGlkZW50aWZpZXIpOwogICAgICAgICBp ZiAoZXJyb3IpCi0gICAgICAgICAgICByZXR1cm4gY2FsbGJhY2soZXJyb3IsIHsgfSwgeyB9KTsK KyAgICAgICAgICAgIHJldHVybiBjYWxsYmFjayhlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbiwg eyB9KTsKICAgICAgICAgaWYgKGF1dG8ganNvblZhbHVlID0gSlNPTjo6VmFsdWU6OnBhcnNlSlNP TihTdHJpbmc6OmZyb21VVEY4KHN0YXRpY19jYXN0PGNvbnN0IExDaGFyKj4oZGF0YS5ieXRlcyks IGRhdGEubGVuZ3RoKSkpCi0gICAgICAgICAgICByZXR1cm4gY2FsbGJhY2soeyB9LCByZXNwb25z ZSwganNvblZhbHVlLT5hc09iamVjdCgpKTsKLSAgICAgICAgY2FsbGJhY2soeyB9LCByZXNwb25z ZSwgbnVsbHB0cik7CisgICAgICAgICAgICByZXR1cm4gY2FsbGJhY2soeyB9LCBqc29uVmFsdWUt PmFzT2JqZWN0KCkpOworICAgICAgICBjYWxsYmFjayh7IH0sIG51bGxwdHIpOwogICAgIH0pLmdl dCgpXTsKICAgICBbdGFzayByZXN1bWVdOwogICAgIHRhc2tNYXAoKS5hZGQoaWRlbnRpZmllciwg dGFzayk7Cg== 440986 2021-10-12 14:39:46 -0700 2021-10-12 15:48:30 -0700 Patch bug-231617-20211012153945.patch text/plain 12387 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcxMmRhYWUwNzdlM2RiZDNi Mjg2NDRkMDBhZmNhMTRhYmRmYzAwMGYuLjMxZTQ3MWE2MGFiYzMwYTk5ZWY0YmQ3Y2MzYWY5MGU4 MTY5YzhhZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMTAtMTIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZWR1Y2UgdXNl IG9mIFdlYkNvcmUgc3RydWN0dXJlcyBpbiBhZGF0dHJpYnV0aW9uZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNjE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcmVkdWNlIHRoZSBt ZW1vcnkgdXNlIG9mIGFkYXR0cmlidXRpb25kLCBJJ20gcGxhbm5pbmcgdG8gaGF2ZSBpdCBub3Qg bGluayBXZWJLaXQuZnJhbWV3b3JrLgorICAgICAgICBUaGlzIGlzIHByb2dyZXNzIHRvd2FyZHMg dGhhdC4KKyAgICAgICAgSSB1c2UgYSBSdW5Mb29wOjpUaW1lciBpbnN0ZWFkIG9mIGEgV2ViQ29y ZTo6VGltZXIsIHdoaWNoIGRvZXMgdGhlIHNhbWUgdGhpbmcgb24gdGhlIG1haW4gdGhyZWFkLgor ICAgICAgICBJIHVzZSBhIFdURjo6U3RyaW5nIHRvIHJlcHJlc2VudCB0aGUgZXJyb3IgZGVzY3Jp cHRpb24gb3IgbGFjayB0aGVyZW9mIGluc3RlYWQgb2Ygc2VuZGluZyB0aGUgd2hvbGUgZXJyb3Iu CisgICAgICAgIEkgc3RvcCBzZW5kaW5nIHRoZSByZXNwb25zZSwgYmVjYXVzZSBpdCB3YXMgdW51 c2VkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXIpOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Omdl dFRva2VuUHVibGljS2V5KToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRNYW5hZ2VyOjpnZXRTaWduZWRVbmxpbmthYmxlVG9rZW4pOgorICAgICAgICAoV2ViS2l0OjpQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJL aXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmlyZUNvbnZlcnNpb25SZXF1ZXN0 SW1wbCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3Jr TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UENNOjpOZXR3b3JrTG9hZGVyOjpzdGFydCk6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvY29jb2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRO ZXR3b3JrTG9hZGVyQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OlBDTTo6TmV0d29ya0xvYWRl cjo6c3RhcnQpOgorCiAyMDIxLTEwLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFNjcm9sbGluZyB0aHJlYWQgYW5pbWF0aW9ucyBuZWVkIHRvIGNv bW1pdCBsYXllcnMgb24gdGhlIHNjcm9sbGluZyB0aHJlYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApp bmRleCBkZWY1OTEwODdlNGYyOTQyYTEyMTYyN2JmOWU3OGY3NzNjZDY1MGZiLi42OTFhYjliZjBi M2NmNmE0MTJmOGUyOTEzMTZkMWRjZDY0NDNlZjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCkBA IC01NCw3ICs1NCw3IEBAIHVzaW5nIEVwaGVtZXJhbFNvdXJjZU5vbmNlID0gUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnQ6OkVwaGVtZXJhbFNvdXJjZU5vbmNlOwogY29uc3RleHByIFNlY29uZHMgZGVi dWdNb2RlU2Vjb25kc1VudGlsU2VuZCB7IDEwX3MgfTsKIAogUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRNYW5hZ2VyOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIoVW5pcXVlUmVmPFBDTTo6 Q2xpZW50PiYmIGNsaWVudCwgY29uc3QgU3RyaW5nJiBzdG9yYWdlRGlyZWN0b3J5KQotICAgIDog bV9maXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHNUaW1lcigqdGhpcywgJlByaXZhdGVDbGlj a01lYXN1cmVtZW50TWFuYWdlcjo6ZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzKQorICAg IDogbV9maXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHNUaW1lcihSdW5Mb29wOjptYWluKCks IHRoaXMsICZQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVQZW5kaW5nQXR0cmli dXRpb25SZXF1ZXN0cykKICAgICAsIG1fc3RvcmFnZURpcmVjdG9yeShzdG9yYWdlRGlyZWN0b3J5 KQogICAgICwgbV9jbGllbnQoV1RGTW92ZShjbGllbnQpKQogewpAQCAtMTM2LDEyICsxMzYsMTIg QEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmdldFRva2VuUHVibGljS2V5 KFByaXZhdGVDbGlja01lYXN1cmVtZW50JiYKICAgICBSRUxFQVNFX0xPR19JTkZPKFByaXZhdGVD bGlja01lYXN1cmVtZW50LCAiQWJvdXQgdG8gZmlyZSBhIHRva2VuIHB1YmxpYyBrZXkgcmVxdWVz dC4iKTsKICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVzc2FnZUxldmVs OjpMb2csICJbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0gQWJvdXQgdG8gZmlyZSBhIHRva2Vu IHB1YmxpYyBrZXkgcmVxdWVzdC4iX3MpOwogCi0gICAgUENNOjpOZXR3b3JrTG9hZGVyOjpzdGFy dChXVEZNb3ZlKHRva2VuUHVibGljS2V5VVJMKSwgbnVsbHB0ciwgcGNtRGF0YUNhcnJpZWQsIFt3 ZWFrVGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCB0aGlzLCBhdHRyaWJ1dGlvbiA9IFdURk1vdmUo YXR0cmlidXRpb24pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSAoYXV0byYgZXJyb3Is IGF1dG8mIHJlc3BvbnNlLCBhdXRvJiBqc29uT2JqZWN0KSBtdXRhYmxlIHsKKyAgICBQQ006Ok5l dHdvcmtMb2FkZXI6OnN0YXJ0KFdURk1vdmUodG9rZW5QdWJsaWNLZXlVUkwpLCBudWxscHRyLCBw Y21EYXRhQ2FycmllZCwgW3dlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHRoaXMsIGF0dHJp YnV0aW9uID0gV1RGTW92ZShhdHRyaWJ1dGlvbiksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFj ayldIChhdXRvJiBlcnJvckRlc2NyaXB0aW9uLCBhdXRvJiBqc29uT2JqZWN0KSBtdXRhYmxlIHsK ICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBp ZiAoIWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29u c29sZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiW1ByaXZhdGUgQ2xp Y2sgTWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAnIl9zLCBlcnJvci5sb2NhbGl6ZWREZXNj cmlwdGlvbigpLCAiJyBmb3IgdG9rZW4gcHVibGljIGtleSByZXF1ZXN0LiJfcykpOworICAgICAg ICBpZiAoIWVycm9yRGVzY3JpcHRpb24uaXNOdWxsKCkpIHsKKyAgICAgICAgICAgIG1fY2xpZW50 LT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5n KCJbUHJpdmF0ZSBDbGljayBNZWFzdXJlbWVudF0gUmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9y RGVzY3JpcHRpb24sICInIGZvciB0b2tlbiBwdWJsaWMga2V5IHJlcXVlc3QuIl9zKSk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTc5LDEyICsxNzksMTIgQEAgdm9pZCBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmdldFNpZ25lZFVubGlua2FibGVUb2tlbihQ cml2YXRlQ2xpY2tNZWFzdXIKICAgICBSRUxFQVNFX0xPR19JTkZPKFByaXZhdGVDbGlja01lYXN1 cmVtZW50LCAiQWJvdXQgdG8gZmlyZSBhIHVubGlua2FibGUgdG9rZW4gc2lnbmluZyByZXF1ZXN0 LiIpOwogICAgIG1fY2xpZW50LT5icm9hZGNhc3RDb25zb2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6 OkxvZywgIltQcml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBBYm91dCB0byBmaXJlIGEgdW5saW5r YWJsZSB0b2tlbiBzaWduaW5nIHJlcXVlc3QuIl9zKTsKIAotICAgIFBDTTo6TmV0d29ya0xvYWRl cjo6c3RhcnQoV1RGTW92ZSh0b2tlblNpZ25hdHVyZVVSTCksIG1lYXN1cmVtZW50LnRva2VuU2ln bmF0dXJlSlNPTigpLCBwY21EYXRhQ2FycmllZCwgW3dlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlz IH0sIHRoaXMsIG1lYXN1cmVtZW50ID0gV1RGTW92ZShtZWFzdXJlbWVudCldIChhdXRvJiBlcnJv ciwgYXV0byYgcmVzcG9uc2UsIGF1dG8mIGpzb25PYmplY3QpIG11dGFibGUgeworICAgIFBDTTo6 TmV0d29ya0xvYWRlcjo6c3RhcnQoV1RGTW92ZSh0b2tlblNpZ25hdHVyZVVSTCksIG1lYXN1cmVt ZW50LnRva2VuU2lnbmF0dXJlSlNPTigpLCBwY21EYXRhQ2FycmllZCwgW3dlYWtUaGlzID0gV2Vh a1B0ciB7ICp0aGlzIH0sIHRoaXMsIG1lYXN1cmVtZW50ID0gV1RGTW92ZShtZWFzdXJlbWVudCld IChhdXRvJiBlcnJvckRlc2NyaXB0aW9uLCBhdXRvJiBqc29uT2JqZWN0KSBtdXRhYmxlIHsKICAg ICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAo IWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29s ZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sg TWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAnIl9zLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlw dGlvbigpLCAiJyBmb3Igc2VjcmV0IHRva2VuIHNpZ25pbmcgcmVxdWVzdC4iX3MpKTsKKyAgICAg ICAgaWYgKCFlcnJvckRlc2NyaXB0aW9uLmlzTnVsbCgpKSB7CisgICAgICAgICAgICBtX2NsaWVu dC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpFcnJvciwgbWFrZVN0cmlu ZygiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAnIl9zLCBlcnJv ckRlc2NyaXB0aW9uLCAiJyBmb3Igc2VjcmV0IHRva2VuIHNpZ25pbmcgcmVxdWVzdC4iX3MpKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC0zMDAsNyArMzAwLDcgQEAgdm9p ZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmF0dHJpYnV0ZShjb25zdCBTb3VyY2VT aXRlJiBzb3VyY2VTaXRlLCBjb24KICAgICAgICAgICAgIGlmICghbWluU2Vjb25kc1VudGlsU2Vu ZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGlmIChtX2ZpcmVQZW5k aW5nQXR0cmlidXRpb25SZXF1ZXN0c1RpbWVyLmlzQWN0aXZlKCkgJiYgbV9maXJlUGVuZGluZ0F0 dHJpYnV0aW9uUmVxdWVzdHNUaW1lci5uZXh0RmlyZUludGVydmFsKCkgPCAqbWluU2Vjb25kc1Vu dGlsU2VuZCkKKyAgICAgICAgICAgIGlmIChtX2ZpcmVQZW5kaW5nQXR0cmlidXRpb25SZXF1ZXN0 c1RpbWVyLmlzQWN0aXZlKCkgJiYgbV9maXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHNUaW1l ci5zZWNvbmRzVW50aWxGaXJlKCkgPCAqbWluU2Vjb25kc1VudGlsU2VuZCkKICAgICAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgICAgIGlmIChVTkxJS0VMWShkZWJ1Z01vZGVFbmFibGVk KCkpKSB7CkBAIC0zNjUsMTIgKzM2NSwxMiBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50 TWFuYWdlcjo6ZmlyZUNvbnZlcnNpb25SZXF1ZXN0SW1wbChjb25zdCBQcml2YXRlQ2xpYwogICAg IFJFTEVBU0VfTE9HX0lORk8oUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQsICJBYm91dCB0byBmaXJl IGFuIGF0dHJpYnV0aW9uIHJlcXVlc3QuIik7CiAgICAgbV9jbGllbnQtPmJyb2FkY2FzdENvbnNv bGVNZXNzYWdlKE1lc3NhZ2VMZXZlbDo6TG9nLCAiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRd IEFib3V0IHRvIGZpcmUgYW4gYXR0cmlidXRpb24gcmVxdWVzdC4iX3MpOwogCi0gICAgUENNOjpO ZXR3b3JrTG9hZGVyOjpzdGFydChXVEZNb3ZlKGF0dHJpYnV0aW9uVVJMKSwgYXR0cmlidXRpb24u YXR0cmlidXRpb25SZXBvcnRKU09OKCksIHBjbURhdGFDYXJyaWVkLCBbd2Vha1RoaXMgPSBXZWFr UHRyIHsgKnRoaXMgfSwgdGhpc10oYXV0byYgZXJyb3IsIGF1dG8mIHJlc3BvbnNlLCBhdXRvJikg eworICAgIFBDTTo6TmV0d29ya0xvYWRlcjo6c3RhcnQoV1RGTW92ZShhdHRyaWJ1dGlvblVSTCks IGF0dHJpYnV0aW9uLmF0dHJpYnV0aW9uUmVwb3J0SlNPTigpLCBwY21EYXRhQ2FycmllZCwgW3dl YWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIHRoaXNdKGF1dG8mIGVycm9yRGVzY3JpcHRpb24s IGF1dG8mKSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgaWYgKCFlcnJvci5pc051bGwoKSkKLSAgICAgICAgICAgIG1fY2xpZW50LT5icm9h ZGNhc3RDb25zb2xlTWVzc2FnZShNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtlU3RyaW5nKCJbUHJp dmF0ZSBDbGljayBNZWFzdXJlbWVudF0gUmVjZWl2ZWQgZXJyb3I6ICciX3MsIGVycm9yLmxvY2Fs aXplZERlc2NyaXB0aW9uKCksICInIGZvciBhZCBjbGljayBhdHRyaWJ1dGlvbiByZXF1ZXN0LiJf cykpOworICAgICAgICBpZiAoIWVycm9yRGVzY3JpcHRpb24uaXNOdWxsKCkpCisgICAgICAgICAg ICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpFcnJvciwg bWFrZVN0cmluZygiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIFJlY2VpdmVkIGVycm9yOiAn Il9zLCBlcnJvckRlc2NyaXB0aW9uLCAiJyBmb3IgYWQgY2xpY2sgYXR0cmlidXRpb24gcmVxdWVz dC4iX3MpKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1h bmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmgKaW5kZXggMWUzYTI5MjUyZWIy Zjg4NDFiYjRhNDk1ZDFkMjMxZWM0ZjhhMjNmOS4uMmVjN2UzYWZkYjQ2MTUwYjBmMjJjNjhlZmIy Y2Y4NTM3M2UwMDYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50 L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCkBAIC04Myw3ICs4Myw3IEBAIHByaXZh dGU6CiAgICAgYm9vbCBmZWF0dXJlRW5hYmxlZCgpIGNvbnN0OwogICAgIGJvb2wgZGVidWdNb2Rl RW5hYmxlZCgpIGNvbnN0OwogCi0gICAgV2ViQ29yZTo6VGltZXIgbV9maXJlUGVuZGluZ0F0dHJp YnV0aW9uUmVxdWVzdHNUaW1lcjsKKyAgICBSdW5Mb29wOjpUaW1lcjxQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI+IG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzVGltZXI7CiAg ICAgYm9vbCBtX2lzUnVubmluZ1Rlc3QgeyBmYWxzZSB9OwogICAgIHN0ZDo6b3B0aW9uYWw8VVJM PiBtX3Rva2VuUHVibGljS2V5VVJMRm9yVGVzdGluZzsKICAgICBzdGQ6Om9wdGlvbmFsPFVSTD4g bV90b2tlblNpZ25hdHVyZVVSTEZvclRlc3Rpbmc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1 cmVtZW50TmV0d29ya0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRl ci5jcHAKaW5kZXggYmIwZTc0MWE1MmZmZWFjM2NjODY2OGUwOWE2ZmExMmNmY2EzYjdlNi4uOWQz YmFmMGFhYmJjNmQ1YjU0MmE2OWU2ODE1MWY2ZjE5MGEyZjNjOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE5ldHdvcmtMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRO ZXR3b3JrTG9hZGVyLmNwcApAQCAtMzgsNyArMzgsNyBAQCBuYW1lc3BhY2UgUENNIHsKIHZvaWQg TmV0d29ya0xvYWRlcjo6c3RhcnQoVVJMJiYsIFJlZlB0cjxKU09OOjpPYmplY3Q+JiYsIFdlYkNv cmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpQY21EYXRhQ2FycmllZCwgQ2FsbGJhY2smJiBj b21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIGNvbXBsZXRp b25IYW5kbGVyKHsgfSwgeyB9LCB7IH0pOworICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSwgeyB9 KTsKIH0KIAogdm9pZCBOZXR3b3JrTG9hZGVyOjphbGxvd1RMU0NlcnRpZmljYXRlQ2hhaW5Gb3JM b2NhbFBDTVRlc3RpbmcoY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVt ZW50TmV0d29ya0xvYWRlci5oCmluZGV4IDZhMWRjYjVlMWY0YzI4YmI3ODk4YzhhYzQ0YzcyMzRl OWRjNWFhNjguLjk5ZDdhMGE2NTM3YmJhYmFhMTk2MGJlMzdlNDNmYmY1Y2M5NWEwNzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudE5ldHdvcmtMb2FkZXIuaApAQCAtNDIsNyArNDIsNyBAQCBuYW1lc3BhY2UgUENN IHsKIGNsYXNzIE5ldHdvcmtMb2FkZXIgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwog cHVibGljOgotICAgIHVzaW5nIENhbGxiYWNrID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25z dCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZSYsIGNvbnN0IFJlZlB0cjxKU09OOjpPYmplY3Q+Jik+OworICAgIHVzaW5nIENhbGxiYWNrID0g Q29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmLCBjb25zdCBSZWZQdHI8SlNPTjo6 T2JqZWN0PiYpPjsKICAgICBzdGF0aWMgdm9pZCBzdGFydChVUkwmJiwgUmVmUHRyPEpTT046Ok9i amVjdD4mJiwgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlBjbURhdGFDYXJyaWVk LCBDYWxsYmFjayYmKTsKICAgICBzdGF0aWMgdm9pZCBhbGxvd1RMU0NlcnRpZmljYXRlQ2hhaW5G b3JMb2NhbFBDTVRlc3RpbmcoY29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJik7CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFz dXJlbWVudC9jb2NvYS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtMb2FkZXJDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQv Y29jb2EvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyQ29jb2EubW0KaW5kZXgg NGY1YTEzYWM2ZWJiMzhkNmU0MDcxNGFmY2E5NjQyMGIyNWI0NzEwMC4uYWNhNTMxYTlkZTg5MmU3 ZmRlM2Y4YTJmN2Q5YmVmNjc3YWJiNDFiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9jb2NvYS9Qcml2YXRlQ2xpY2tNZWFz dXJlbWVudE5ldHdvcmtMb2FkZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L2NvY29hL1ByaXZhdGVDbGlja01lYXN1cmVt ZW50TmV0d29ya0xvYWRlckNvY29hLm1tCkBAIC0xMTIsNyArMTEyLDcgQEAgdm9pZCBOZXR3b3Jr TG9hZGVyOjpzdGFydChVUkwmJiB1cmwsIFJlZlB0cjxKU09OOjpPYmplY3Q+JiYganNvblBheWxv YWQsIFdlYkNvcmUKICAgICAvLyBQcmV2ZW50IGNvbnRhY3Rpbmcgbm9uLWxvY2FsIHNlcnZlcnMg d2hlbiBhIHRlc3QgY2VydGlmaWNhdGUgY2hhaW4gaXMgdXNlZCBmb3IgMTI3LjAuMC4xLgogICAg IC8vIEZJWE1FOiBVc2UgYSBwcm94eSBzZXJ2ZXIgdG8gaGF2ZSB0ZXN0cyBjb3ZlciB0aGUgcmVw b3J0cyBzZW50IHRvIHRoZSBkZXN0aW5hdGlvbiwgdG9vLgogICAgIGlmIChhbGxvd2VkTG9jYWxU ZXN0U2VydmVyVHJ1c3QoKSAmJiB1cmwuaG9zdCgpICE9ICIxMjcuMC4wLjEiKQotICAgICAgICBy ZXR1cm4gY2FsbGJhY2soeyB9LCB7IH0sIHsgfSk7CisgICAgICAgIHJldHVybiBjYWxsYmFjayh7 IH0sIHsgfSk7CiAKICAgICBhdXRvIHJlcXVlc3QgPSBhZG9wdE5TKFtbTlNNdXRhYmxlVVJMUmVx dWVzdCBhbGxvY10gaW5pdFdpdGhVUkw6dXJsXSk7CiAgICAgW3JlcXVlc3Qgc2V0VmFsdWU6V2Vi Q29yZTo6SFRUUEhlYWRlclZhbHVlczo6bWF4QWdlMCgpIGZvckhUVFBIZWFkZXJGaWVsZDpAIkNh Y2hlLUNvbnRyb2wiXTsKQEAgLTEyOSwxMCArMTI5LDEwIEBAIHZvaWQgTmV0d29ya0xvYWRlcjo6 c3RhcnQoVVJMJiYgdXJsLCBSZWZQdHI8SlNPTjo6T2JqZWN0PiYmIGpzb25QYXlsb2FkLCBXZWJD b3JlCiAgICAgTlNVUkxTZXNzaW9uRGF0YVRhc2sgKnRhc2sgPSBbc3RhdGVsZXNzU2Vzc2lvbldp dGhvdXRSZWRpcmVjdHMoKSBkYXRhVGFza1dpdGhSZXF1ZXN0OnJlcXVlc3QuZ2V0KCkgY29tcGxl dGlvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBp ZGVudGlmaWVyXShOU0RhdGEgKmRhdGEsIE5TVVJMUmVzcG9uc2UgKnJlc3BvbnNlLCBOU0Vycm9y ICplcnJvcikgbXV0YWJsZSB7CiAgICAgICAgIHRhc2tNYXAoKS5yZW1vdmUoaWRlbnRpZmllcik7 CiAgICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAgIHJldHVybiBjYWxsYmFjayhlcnJvciwg eyB9LCB7IH0pOworICAgICAgICAgICAgcmV0dXJuIGNhbGxiYWNrKGVycm9yLmxvY2FsaXplZERl c2NyaXB0aW9uLCB7IH0pOwogICAgICAgICBpZiAoYXV0byBqc29uVmFsdWUgPSBKU09OOjpWYWx1 ZTo6cGFyc2VKU09OKFN0cmluZzo6ZnJvbVVURjgoc3RhdGljX2Nhc3Q8Y29uc3QgTENoYXIqPihk YXRhLmJ5dGVzKSwgZGF0YS5sZW5ndGgpKSkKLSAgICAgICAgICAgIHJldHVybiBjYWxsYmFjayh7 IH0sIHJlc3BvbnNlLCBqc29uVmFsdWUtPmFzT2JqZWN0KCkpOwotICAgICAgICBjYWxsYmFjayh7 IH0sIHJlc3BvbnNlLCBudWxscHRyKTsKKyAgICAgICAgICAgIHJldHVybiBjYWxsYmFjayh7IH0s IGpzb25WYWx1ZS0+YXNPYmplY3QoKSk7CisgICAgICAgIGNhbGxiYWNrKHsgfSwgbnVsbHB0cik7 CiAgICAgfSkuZ2V0KCldOwogICAgIFt0YXNrIHJlc3VtZV07CiAgICAgdGFza01hcCgpLmFkZChp ZGVudGlmaWVyLCB0YXNrKTsK