224367 2021-04-09 06:18:45 -0700 Make sure all frames get transformed when overriding a transform with another one 2021-04-16 14:59:10 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224696 InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1748709 0 youennf 2021-04-09 06:18:45 -0700 Make sure all frames get transformed when overriding a transform with another one 1749147 1 425721 youennf 2021-04-12 01:00:13 -0700 Created attachment 425721 Patch 1749202 2 ews-feeder 2021-04-12 06:16:01 -0700 Committed r275819 (236389@main): <https://commits.webkit.org/236389@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425721. 1749203 3 webkit-bug-importer 2021-04-12 06:17:15 -0700 <rdar://problem/76535687> 425721 2021-04-12 01:00:13 -0700 2021-04-12 06:16:02 -0700 Patch bug-224367-20210412100006.patch text/plain 30788 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmOGNiNGI3N2I3MDI3 OWJlNzE5NGJjYzg1MWM1MDk5MzA3NmEyNi4uODVkMmY2MjIyMDkyNmY0YWZiYzg4Njc3OTNmZGJh ODVjZjgxNmYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDIxLTA0LTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUgYWxsIGZy YW1lcyBnZXQgdHJhbnNmb3JtZWQgd2hlbiBvdmVycmlkaW5nIGEgdHJhbnNmb3JtIHdpdGggYW5v dGhlciBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDM2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlIHdlcmUgcHJldmlvdXNseSByZW1vdmluZyB0aGUgb2xkIHRyYW5zZm9ybSwgdGhlbiBhdHRh Y2hpbmcgdGhlIG5ldyB0cmFuc2Zvcm4uCisgICAgICAgIFRoZXJlIHdhcyBhIHRpbWUgd2hlcmUg bm8gdHJhbnNmb3JtIHdhcyBhdHRhY2hlZCBhbmQgYSBmZXcgc2FtcGxlcyBjb3VsZCBnZXQgbWlz c2VkLgorICAgICAgICBUbyBwcmV2ZW50IHRoaXMsIHdlIGFkZCBhIG5ldyBjb2RlIHBhdGggd2hl cmUgd2UgdHJhbnNmZXIgYSBiYWNrZW5kIGZyb20gb25lIHRyYW5zZm9ybSB0byBhbm90aGVyLgor ICAgICAgICBJbiB0aGF0IGNhc2UsIHdlIHN5bmNocm9ub3Vsc3kgY2hhbmdlIHRoZSBpbnB1dCBj YWxsYmFjayBmcm9tIHRoZSBvbGQgb25lIHRvIHRoZSBuZXcgb25lIGluc3RlYWQgb2Ygc2V0dGlu ZyBpdCB0byBudWxsIGluIGJldHdlZW4uCisKKyAgICAgICAgVGVzdDogaHR0cC93cHQvd2VicnRj L2NoYW5nZS1lbmNvZGVkLXRyYW5zZm9ybS5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1J0cFJlY2VpdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFJlY2Vp dmVyOjpzZXRUcmFuc2Zvcm0pOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRw UmVjZWl2ZXIuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFJlY2VpdmVy QmFja2VuZC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2NyaXB0VHJh bnNmb3JtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6flJU Q1J0cFNjcmlwdFRyYW5zZm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpSVENSdHBTY3JpcHRUcmFu c2Zvcm06OndpbGxDbGVhckJhY2tlbmQpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUnRwU2NyaXB0 VHJhbnNmb3JtOjpjbGVhcik6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBT Y3JpcHRUcmFuc2Zvcm0uaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNj cmlwdFRyYW5zZm9ybWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNjcmlwdFRyYW5z Zm9ybWVyOjpjbGVhcik6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTY3Jp cHRUcmFuc2Zvcm1lci5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2Vu ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1J0cFNlbmRlcjo6c2V0VHJhbnNmb3JtKToK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5oOgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyQmFja2VuZC5oOgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwVHJhbnNmb3JtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJUQ1J0cFRyYW5zZm9ybTo6ZnJvbSk6CisgICAgICAgIChXZWJDb3JlOjpSVENSdHBUcmFuc2Zv cm06OmF0dGFjaFRvUmVjZWl2ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUnRwVHJhbnNmb3Jt OjphdHRhY2hUb1NlbmRlcik6CisgICAgICAgIChXZWJDb3JlOjpSVENSdHBUcmFuc2Zvcm06OmJh Y2tlbmRUcmFuc2ZlcmVkVG9OZXdUcmFuc2Zvcm0pOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUnRwVHJhbnNmb3JtLmg6CisgICAgICAgIChXZWJDb3JlOjpSVENSdHBUcmFuc2Zv cm06OnRha2VCYWNrZW5kKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENSdHBSZWNlaXZlckJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGli V2ViUlRDUnRwUmVjZWl2ZXJCYWNrZW5kOjpydGNSdHBUcmFuc2Zvcm1CYWNrZW5kKToKKyAgICAg ICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENSdHBSZWNlaXZlckJh Y2tlbmQuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENSdHBTZW5kZXJCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1J0cFNl bmRlckJhY2tlbmQ6OkxpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6TGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6cnRjUnRwVHJhbnNmb3JtQmFja2VuZCk6Cisg ICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVy QmFja2VuZC5oOgorCiAyMDIxLTA0LTA3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBVcGRhdGUgU0ZyYW1lIGltcGxlbWVudGF0aW9uIHRvIGxhdGVzdCB2ZXJz aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0 cFJlY2VpdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRw UmVjZWl2ZXIuY3BwCmluZGV4IDdkNDUwNjY2ZDE5MGRlZTRmYTI3MGE2ZDJjYzIwYTRiYTNkNzk0 MGEuLjlhMDM4NWQzYjQ1MzljNDA1MGY3NmU5MDhmOTY4M2FkZTI1YjUzZGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwUmVjZWl2ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwUmVjZWl2ZXIuY3Bw CkBAIC05MiwyMCArOTIsMjUgQEAgT3B0aW9uYWw8UlRDUnRwQ2FwYWJpbGl0aWVzPiBSVENSdHBS ZWNlaXZlcjo6Z2V0Q2FwYWJpbGl0aWVzKFNjcmlwdEV4ZWN1dGlvbkNvbnQKICAgICByZXR1cm4g UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpyZWNlaXZlckNhcGFiaWxpdGllcyhjb250ZXh0LCBraW5k KTsKIH0KIAotRXhjZXB0aW9uT3I8dm9pZD4gUlRDUnRwUmVjZWl2ZXI6OnNldFRyYW5zZm9ybShP cHRpb25hbDxSVENSdHBUcmFuc2Zvcm0+JiYgdHJhbnNmb3JtKQorRXhjZXB0aW9uT3I8dm9pZD4g UlRDUnRwUmVjZWl2ZXI6OnNldFRyYW5zZm9ybShzdGQ6OnVuaXF1ZV9wdHI8UlRDUnRwVHJhbnNm b3JtPiYmIHRyYW5zZm9ybSkKIHsKICAgICBBTFdBWVNfTE9HX0lGKG1fY29ubmVjdGlvbiwgTE9H SURFTlRJRklFUl9SRUNFSVZFUik7CiAKICAgICBpZiAodHJhbnNmb3JtICYmIG1fdHJhbnNmb3Jt ICYmICp0cmFuc2Zvcm0gPT0gKm1fdHJhbnNmb3JtKQogICAgICAgICByZXR1cm4geyB9OwotICAg IGlmICh0cmFuc2Zvcm0gJiYgdHJhbnNmb3JtLT5pc0F0dGFjaGVkKCkpCisgICAgaWYgKCF0cmFu c2Zvcm0pIHsKKyAgICAgICAgaWYgKG1fdHJhbnNmb3JtKSB7CisgICAgICAgICAgICBtX3RyYW5z Zm9ybS0+ZGV0YWNoRnJvbVJlY2VpdmVyKCp0aGlzKTsKKyAgICAgICAgICAgIG1fdHJhbnNmb3Jt ID0geyB9OworICAgICAgICB9CisgICAgICAgIHJldHVybiB7IH07CisgICAgfQorCisgICAgaWYg KHRyYW5zZm9ybS0+aXNBdHRhY2hlZCgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52 YWxpZFN0YXRlRXJyb3IsICJ0cmFuc2Zvcm0gaXMgYWxyZWFkeSBpbiB1c2UiX3MgfTsKIAotICAg IGlmIChtX3RyYW5zZm9ybSkKLSAgICAgICAgbV90cmFuc2Zvcm0tPmRldGFjaEZyb21SZWNlaXZl cigqdGhpcyk7CisgICAgdHJhbnNmb3JtLT5hdHRhY2hUb1JlY2VpdmVyKCp0aGlzLCBtX3RyYW5z Zm9ybS5nZXQoKSk7CiAgICAgbV90cmFuc2Zvcm0gPSBXVEZNb3ZlKHRyYW5zZm9ybSk7Ci0gICAg aWYgKG1fdHJhbnNmb3JtKQotICAgICAgICBtX3RyYW5zZm9ybS0+YXR0YWNoVG9SZWNlaXZlcigq dGhpcyk7CiAKICAgICByZXR1cm4geyB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBSZWNlaXZlci5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENSdHBSZWNlaXZlci5oCmluZGV4IGVhYzRmMjdlNDFhNzkxZDdj ZmE0MjRhOTFiN2Y0OTNlMmY0OTkxMzYuLmI5ZDk5NjkxZDYzOGFkOGI1YTFkZDcxN2FiNDE0NTgw YTQyOTVkMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v UlRDUnRwUmVjZWl2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1J0cFJlY2VpdmVyLmgKQEAgLTczLDcgKzczLDcgQEAgcHVibGljOgogICAgIHZvaWQgZ2V0 U3RhdHMoUmVmPERlZmVycmVkUHJvbWlzZT4mJik7CiAKICAgICBPcHRpb25hbDxSVENSdHBUcmFu c2Zvcm06OkludGVybmFsPiB0cmFuc2Zvcm0oKTsKLSAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRU cmFuc2Zvcm0oT3B0aW9uYWw8UlRDUnRwVHJhbnNmb3JtPiYmKTsKKyAgICBFeGNlcHRpb25Pcjx2 b2lkPiBzZXRUcmFuc2Zvcm0oc3RkOjp1bmlxdWVfcHRyPFJUQ1J0cFRyYW5zZm9ybT4mJik7CiAK IHByaXZhdGU6CiAgICAgUlRDUnRwUmVjZWl2ZXIoUGVlckNvbm5lY3Rpb25CYWNrZW5kJiwgUmVm PE1lZGlhU3RyZWFtVHJhY2s+JiYsIHN0ZDo6dW5pcXVlX3B0cjxSVENSdHBSZWNlaXZlckJhY2tl bmQ+JiYpOwpAQCAtODgsNyArODgsNyBAQCBwcml2YXRlOgogICAgIFJlZjxNZWRpYVN0cmVhbVRy YWNrPiBtX3RyYWNrOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxSVENSdHBSZWNlaXZlckJhY2tlbmQ+ IG1fYmFja2VuZDsKICAgICBXZWFrUHRyPFBlZXJDb25uZWN0aW9uQmFja2VuZD4gbV9jb25uZWN0 aW9uOwotICAgIE9wdGlvbmFsPFJUQ1J0cFRyYW5zZm9ybT4gbV90cmFuc2Zvcm07CisgICAgc3Rk Ojp1bmlxdWVfcHRyPFJUQ1J0cFRyYW5zZm9ybT4gbV90cmFuc2Zvcm07CiAjaWYgIVJFTEVBU0Vf TE9HX0RJU0FCTEVECiAgICAgUmVmPGNvbnN0IExvZ2dlcj4gbV9sb2dnZXI7CiAgICAgY29uc3Qg dm9pZCogbV9sb2dJZGVudGlmaWVyIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBSZWNlaXZlckJhY2tlbmQuaCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwUmVjZWl2ZXJCYWNrZW5kLmgKaW5k ZXggNjE5NmE2YTUwNjg5NThhOTI5MWIzNjQyM2VmMGJjZWE2MjQ0MGQzZi4uZmQ0NGVkYmNmYmJl NjczYjExYWFmOGNmMzhiNjVjZWIwZDY1OGU0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBSZWNlaXZlckJhY2tlbmQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFJlY2VpdmVyQmFja2VuZC5oCkBAIC0z OSw3ICszOSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFJUQ1J0cFBhcmFtZXRlcnMgZ2V0UGFy YW1ldGVycygpIHsgcmV0dXJuIHsgfTsgfQogICAgIHZpcnR1YWwgVmVjdG9yPFJUQ1J0cENvbnRy aWJ1dGluZ1NvdXJjZT4gZ2V0Q29udHJpYnV0aW5nU291cmNlcygpIGNvbnN0IHsgcmV0dXJuIHsg fTsgfQogICAgIHZpcnR1YWwgVmVjdG9yPFJUQ1J0cFN5bmNocm9uaXphdGlvblNvdXJjZT4gZ2V0 U3luY2hyb25pemF0aW9uU291cmNlcygpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQotICAgIHZpcnR1 YWwgUmVmPFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQ+IGNyZWF0ZVJUQ1J0cFRyYW5zZm9ybUJhY2tl bmQoKSA9IDA7CisgICAgdmlydHVhbCBSZWY8UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4gcnRjUnRw VHJhbnNmb3JtQmFja2VuZCgpID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2NyaXB0 VHJhbnNmb3JtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRw U2NyaXB0VHJhbnNmb3JtLmNwcAppbmRleCAxMTdlNGYyYTU4OWZjNWViZTVlYzY3YzI2MGZhNjNl OWZiNjcyMmUxLi42ZTVlNjgxNmJlYWQxOThkYzM1ZDQ1MTBiNWUxNmI5YWQ3ZGI0ODZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNjcmlwdFRy YW5zZm9ybS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENS dHBTY3JpcHRUcmFuc2Zvcm0uY3BwCkBAIC03Niw3ICs3Niw3IEBAIFJUQ1J0cFNjcmlwdFRyYW5z Zm9ybTo6UlRDUnRwU2NyaXB0VHJhbnNmb3JtKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRl eHQsIFJlCiAKIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6flJUQ1J0cFNjcmlwdFRyYW5zZm9ybSgp CiB7Ci0gICAgY2xlYXIoKTsKKyAgICBjbGVhcihSVENSdHBTY3JpcHRUcmFuc2Zvcm1lcjo6Q2xl YXJDYWxsYmFjazo6WWVzKTsKIH0KIAogdm9pZCBSVENSdHBTY3JpcHRUcmFuc2Zvcm06OnNldFRy YW5zZm9ybWVyKFJUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyJiB0cmFuc2Zvcm1lcikKQEAgLTEwNyw3 ICsxMDcsNyBAQCB2b2lkIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6aW5pdGlhbGl6ZUJhY2tlbmRG b3JTZW5kZXIoUlRDUnRwVHJhbnNmb3JtQmFja2VuZCYgYgogCiB2b2lkIFJUQ1J0cFNjcmlwdFRy YW5zZm9ybTo6d2lsbENsZWFyQmFja2VuZChSVENSdHBUcmFuc2Zvcm1CYWNrZW5kJikKIHsKLSAg ICBjbGVhcigpOworICAgIGNsZWFyKFJUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyOjpDbGVhckNhbGxi YWNrOjpZZXMpOwogfQogCiB2b2lkIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6aW5pdGlhbGl6ZVRy YW5zZm9ybWVyKFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQmIGJhY2tlbmQpCkBAIC0xMzAsMTUgKzEz MCwxNSBAQCBib29sIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6c2V0dXBUcmFuc2Zvcm1lcihSZWY8 UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4mJiBiYWNrZQogICAgIHJldHVybiB0cnVlOwogfQogCi12 b2lkIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybTo6Y2xlYXIoKQordm9pZCBSVENSdHBTY3JpcHRUcmFu c2Zvcm06OmNsZWFyKFJUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyOjpDbGVhckNhbGxiYWNrIGNsZWFy Q2FsbGJhY2spCiB7CiAgICAgbV9pc0F0dGFjaGVkID0gZmFsc2U7CiAKICAgICBhdXRvIGxvY2tl ciA9IGhvbGRMb2NrKG1fdHJhbnNmb3JtZXJMb2NrKTsKICAgICBtX2lzVHJhbnNmb3JtZXJJbml0 aWFsaXplZCA9IGZhbHNlOwotICAgIG1fd29ya2VyLT5wb3N0VGFza1RvV29ya2VyR2xvYmFsU2Nv cGUoW3RyYW5zZm9ybWVyID0gV1RGTW92ZShtX3RyYW5zZm9ybWVyKV0oYXV0byYpIG11dGFibGUg eworICAgIG1fd29ya2VyLT5wb3N0VGFza1RvV29ya2VyR2xvYmFsU2NvcGUoW3RyYW5zZm9ybWVy ID0gV1RGTW92ZShtX3RyYW5zZm9ybWVyKSwgY2xlYXJDYWxsYmFja10oYXV0byYpIG11dGFibGUg ewogICAgICAgICBpZiAodHJhbnNmb3JtZXIpCi0gICAgICAgICAgICB0cmFuc2Zvcm1lci0+Y2xl YXIoKTsKKyAgICAgICAgICAgIHRyYW5zZm9ybWVyLT5jbGVhcihjbGVhckNhbGxiYWNrKTsKICAg ICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENSdHBTY3JpcHRUcmFuc2Zvcm0uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUnRwU2NyaXB0VHJhbnNmb3JtLmgKaW5kZXggZWIyNzU3MmU2MGEyZGFkYTMxOTA4 MWRlZDIxZjRhOGEzOTdiYWM2My4uODM1YTdjODQ5NDQ3ZWQwODg2NDM5ZGU0YzUyNzRiMmQ1ZDJm ZDBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENS dHBTY3JpcHRUcmFuc2Zvcm0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1J0cFNjcmlwdFRyYW5zZm9ybS5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAi QWN0aXZlRE9NT2JqZWN0LmgiCiAjaW5jbHVkZSAiRXZlbnRUYXJnZXQuaCIKICNpbmNsdWRlICJN ZXNzYWdlUG9ydC5oIgorI2luY2x1ZGUgIlJUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyLmgiCiAjaW5j bHVkZSA8SmF2YVNjcmlwdENvcmUvSlNDSlNWYWx1ZS5oPgogI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+ CiAjaW5jbHVkZSA8d3RmL1RocmVhZFNhZmVSZWZDb3VudGVkLmg+CkBAIC01Nyw2ICs1OCw3IEBA IHB1YmxpYzoKICAgICB2b2lkIGluaXRpYWxpemVCYWNrZW5kRm9yUmVjZWl2ZXIoUlRDUnRwVHJh bnNmb3JtQmFja2VuZCYpOwogICAgIHZvaWQgaW5pdGlhbGl6ZUJhY2tlbmRGb3JTZW5kZXIoUlRD UnRwVHJhbnNmb3JtQmFja2VuZCYpOwogICAgIHZvaWQgd2lsbENsZWFyQmFja2VuZChSVENSdHBU cmFuc2Zvcm1CYWNrZW5kJik7CisgICAgdm9pZCBiYWNrZW5kVHJhbnNmZXJlZFRvTmV3VHJhbnNm b3JtKCkgeyBjbGVhcihSVENSdHBTY3JpcHRUcmFuc2Zvcm1lcjo6Q2xlYXJDYWxsYmFjazo6Tm8p OyB9CiAKICAgICB1c2luZyBUaHJlYWRTYWZlUmVmQ291bnRlZDo6cmVmOwogICAgIHVzaW5nIFRo cmVhZFNhZmVSZWZDb3VudGVkOjpkZXJlZjsKQEAgLTY2LDcgKzY4LDcgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgaW5pdGlhbGl6ZVRyYW5zZm9ybWVyKFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQmKTsK ICAgICBib29sIHNldHVwVHJhbnNmb3JtZXIoUmVmPFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQ+JiYp OwotICAgIHZvaWQgY2xlYXIoKTsKKyAgICB2b2lkIGNsZWFyKFJUQ1J0cFNjcmlwdFRyYW5zZm9y bWVyOjpDbGVhckNhbGxiYWNrKTsKIAogICAgIC8vIEFjdGl2ZURPTU9iamVjdAogICAgIGNvbnN0 IGNoYXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCB7IHJldHVybiAiUlRDUnRwU2NyaXB0 VHJhbnNmb3JtIjsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENSdHBTY3JpcHRUcmFuc2Zvcm1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyLmNwcAppbmRleCBjMTY1YzQ5NjIx NzdlZGUzMjQxOWE2ZWRiMjBmMjM5NjlkZmNlMzY0Li45ZWQwMGEwNjExYjljODYyMzUyZjEwNTEw OTM5NmQzZmQ0MWUyODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNjcmlwdFRyYW5zZm9ybWVyLmNwcApAQCAtMTMwLDkg KzEzMCw5IEBAIHZvaWQgUlRDUnRwU2NyaXB0VHJhbnNmb3JtZXI6OnN0YXJ0KFJlZjxSVENSdHBU cmFuc2Zvcm1CYWNrZW5kPiYmIGJhY2tlbmQpCiAgICAgfSk7CiB9CiAKLXZvaWQgUlRDUnRwU2Ny aXB0VHJhbnNmb3JtZXI6OmNsZWFyKCkKK3ZvaWQgUlRDUnRwU2NyaXB0VHJhbnNmb3JtZXI6OmNs ZWFyKENsZWFyQ2FsbGJhY2sgY2xlYXJDYWxsYmFjaykKIHsKLSAgICBpZiAobV9iYWNrZW5kKQor ICAgIGlmIChtX2JhY2tlbmQgJiYgY2xlYXJDYWxsYmFjayA9PSBDbGVhckNhbGxiYWNrOjpZZXMp CiAgICAgICAgIG1fYmFja2VuZC0+Y2xlYXJUcmFuc2Zvcm1hYmxlRnJhbWVDYWxsYmFjaygpOwog ICAgIG1fYmFja2VuZCA9IG51bGxwdHI7CiAgICAgc3RvcFBlbmRpbmdBY3Rpdml0eSgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTY3JpcHRU cmFuc2Zvcm1lci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBT Y3JpcHRUcmFuc2Zvcm1lci5oCmluZGV4IDc2YTRkZjE4ZmMwZjU0MDU0NDEwYWIzMjZmYzEzNDQ0 ODVjOGY5M2MuLjY5YWYzNDQ2ZDQ3NTE2OWY3NGRlZTM3ODc5YWU4NTUwMTYxMjkwMDUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2NyaXB0VHJh bnNmb3JtZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0 cFNjcmlwdFRyYW5zZm9ybWVyLmgKQEAgLTYxLDcgKzYxLDkgQEAgcHVibGljOgogCiAgICAgdm9p ZCBzdGFydFBlbmRpbmdBY3Rpdml0eSgpIHsgbV9wZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGlu Z0FjdGl2aXR5KCp0aGlzKTsgfQogICAgIHZvaWQgc3RhcnQoUmVmPFJUQ1J0cFRyYW5zZm9ybUJh Y2tlbmQ+JiYpOwotICAgIHZvaWQgY2xlYXIoKTsKKworICAgIGVudW0gY2xhc3MgQ2xlYXJDYWxs YmFjayB7IE5vLCBZZXN9OworICAgIHZvaWQgY2xlYXIoQ2xlYXJDYWxsYmFjayk7CiAKIHByaXZh dGU6CiAgICAgUlRDUnRwU2NyaXB0VHJhbnNmb3JtZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYs IFJlZjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+JiYsIFJlZjxNZXNzYWdlUG9ydD4mJiwgUmVmPFJl YWRhYmxlU3RyZWFtPiYmLCBSZWY8U2ltcGxlUmVhZGFibGVTdHJlYW1Tb3VyY2U+JiYpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuY3Bw CmluZGV4IDA3YzExNzk2NDEzYTgzMWQ4YWIwMjk2NjM5YmJhZWI4OTJlZDhiMTkuLmY4OTMyOTM3 NzY0ODUwNGJjODI0OTg2YjMzMjg3MzcyMzY0MDg3ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5jcHAKQEAgLTIyMywyMCArMjIz LDI1IEBAIE9wdGlvbmFsPFJUQ1J0cFRyYW5zY2VpdmVyRGlyZWN0aW9uPiBSVENSdHBTZW5kZXI6 OmN1cnJlbnRUcmFuc2NlaXZlckRpcmVjdGlvbigpCiAgICAgcmV0dXJuIHNlbmRlclRyYW5zY2Vp dmVyLT5jdXJyZW50RGlyZWN0aW9uKCk7CiB9CiAKLUV4Y2VwdGlvbk9yPHZvaWQ+IFJUQ1J0cFNl bmRlcjo6c2V0VHJhbnNmb3JtKE9wdGlvbmFsPFJUQ1J0cFRyYW5zZm9ybT4mJiB0cmFuc2Zvcm0p CitFeGNlcHRpb25Pcjx2b2lkPiBSVENSdHBTZW5kZXI6OnNldFRyYW5zZm9ybShzdGQ6OnVuaXF1 ZV9wdHI8UlRDUnRwVHJhbnNmb3JtPiYmIHRyYW5zZm9ybSkKIHsKICAgICBBTFdBWVNfTE9HX0lG KG1fY29ubmVjdGlvbiwgTE9HSURFTlRJRklFUl9TRU5ERVIpOwogCiAgICAgaWYgKHRyYW5zZm9y bSAmJiBtX3RyYW5zZm9ybSAmJiAqdHJhbnNmb3JtID09ICptX3RyYW5zZm9ybSkKICAgICAgICAg cmV0dXJuIHsgfTsKLSAgICBpZiAodHJhbnNmb3JtICYmIHRyYW5zZm9ybS0+aXNBdHRhY2hlZCgp KQorICAgIGlmICghdHJhbnNmb3JtKSB7CisgICAgICAgIGlmIChtX3RyYW5zZm9ybSkgeworICAg ICAgICAgICAgbV90cmFuc2Zvcm0tPmRldGFjaEZyb21TZW5kZXIoKnRoaXMpOworICAgICAgICAg ICAgbV90cmFuc2Zvcm0gPSB7IH07CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHsgfTsKKyAg ICB9CisKKyAgICBpZiAodHJhbnNmb3JtLT5pc0F0dGFjaGVkKCkpCiAgICAgICAgIHJldHVybiBF eGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciwgInRyYW5zZm9ybSBpcyBhbHJlYWR5IGluIHVz ZSJfcyB9OwogCi0gICAgaWYgKG1fdHJhbnNmb3JtKQotICAgICAgICBtX3RyYW5zZm9ybS0+ZGV0 YWNoRnJvbVNlbmRlcigqdGhpcyk7CisgICAgdHJhbnNmb3JtLT5hdHRhY2hUb1NlbmRlcigqdGhp cywgbV90cmFuc2Zvcm0uZ2V0KCkpOwogICAgIG1fdHJhbnNmb3JtID0gV1RGTW92ZSh0cmFuc2Zv cm0pOwotICAgIGlmIChtX3RyYW5zZm9ybSkKLSAgICAgICAgbV90cmFuc2Zvcm0tPmF0dGFjaFRv U2VuZGVyKCp0aGlzKTsKIAogICAgIHJldHVybiB7IH07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5oIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuaAppbmRleCA2OGRlYjhlYmFiNWY0 ZDg2NTIyYTdlYTRlMWYwYjU1OTBiYWZlYTllLi41MmFiZjNkMTllMzk2ZWVjODc1Njg3MzcwMGVm NTM4YmE0MjE1OTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1J0cFNlbmRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUlRDUnRwU2VuZGVyLmgKQEAgLTkwLDcgKzkwLDcgQEAgcHVibGljOgogICAgIE9wdGlvbmFs PFJUQ1J0cFRyYW5zY2VpdmVyRGlyZWN0aW9uPiBjdXJyZW50VHJhbnNjZWl2ZXJEaXJlY3Rpb24o KSBjb25zdDsKIAogICAgIE9wdGlvbmFsPFJUQ1J0cFRyYW5zZm9ybTo6SW50ZXJuYWw+IHRyYW5z Zm9ybSgpOwotICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldFRyYW5zZm9ybShPcHRpb25hbDxSVENS dHBUcmFuc2Zvcm0+JiYpOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldFRyYW5zZm9ybShzdGQ6 OnVuaXF1ZV9wdHI8UlRDUnRwVHJhbnNmb3JtPiYmKTsKIAogcHJpdmF0ZToKICAgICBSVENSdHBT ZW5kZXIoUlRDUGVlckNvbm5lY3Rpb24mLCBTdHJpbmcmJiB0cmFja0tpbmQsIHN0ZDo6dW5pcXVl X3B0cjxSVENSdHBTZW5kZXJCYWNrZW5kPiYmKTsKQEAgLTEwOCw3ICsxMDgsNyBAQCBwcml2YXRl OgogICAgIHN0ZDo6dW5pcXVlX3B0cjxSVENSdHBTZW5kZXJCYWNrZW5kPiBtX2JhY2tlbmQ7CiAg ICAgV2Vha1B0cjxSVENQZWVyQ29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwogICAgIFJlZlB0cjxS VENEVE1GU2VuZGVyPiBtX2R0bWZTZW5kZXI7Ci0gICAgT3B0aW9uYWw8UlRDUnRwVHJhbnNmb3Jt PiBtX3RyYW5zZm9ybTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UlRDUnRwVHJhbnNmb3JtPiBtX3Ry YW5zZm9ybTsKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBSZWY8Y29uc3QgTG9nZ2Vy PiBtX2xvZ2dlcjsKICAgICBjb25zdCB2b2lkKiBtX2xvZ0lkZW50aWZpZXIgeyBudWxscHRyIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNl bmRlckJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRw U2VuZGVyQmFja2VuZC5oCmluZGV4IDQ1MmNjNzZjZDBmNjYyZGExYWUxZmE5MmZmNzBkZjZkNzU2 ODg2ZDYuLjJiZjYyZDkwNTllZjhiMGNiYjc1ZDQyMmM3NzcwMzUzMjliZTVjY2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyQmFja2Vu ZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVy QmFja2VuZC5oCkBAIC00OSw3ICs0OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFJUQ1J0cFNl bmRQYXJhbWV0ZXJzIGdldFBhcmFtZXRlcnMoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lk IHNldFBhcmFtZXRlcnMoY29uc3QgUlRDUnRwU2VuZFBhcmFtZXRlcnMmLCBET01Qcm9taXNlRGVm ZXJyZWQ8dm9pZD4mJikgPSAwOwogICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPFJUQ0RUTUZT ZW5kZXJCYWNrZW5kPiBjcmVhdGVEVE1GQmFja2VuZCgpID0gMDsKLSAgICB2aXJ0dWFsIFJlZjxS VENSdHBUcmFuc2Zvcm1CYWNrZW5kPiBjcmVhdGVSVENSdHBUcmFuc2Zvcm1CYWNrZW5kKCkgPSAw OworICAgIHZpcnR1YWwgUmVmPFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQ+IHJ0Y1J0cFRyYW5zZm9y bUJhY2tlbmQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldE1lZGlhU3RyZWFtSWRzKGNvbnN0 IFZlY3RvcjxTdHJpbmc+JikgPSAwOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBUcmFuc2Zvcm0uY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBUcmFuc2Zvcm0uY3BwCmluZGV4IDNjN2ZjZjRiZDI0 Mjc1NmUzMWM1ZGIzOGFjOTZiYjhhMWY3NDA4MjEuLjljYWViOTZmY2IyODYyODhlNWZjMWEwZThk ZDRlNjhmYTc4NTUwYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUnRwVHJhbnNmb3JtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1J0cFRyYW5zZm9ybS5jcHAKQEAgLTMzLDExICszMywxMSBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLU9wdGlvbmFsPFJUQ1J0cFRyYW5zZm9ybT4gUlRDUnRwVHJhbnNm b3JtOjpmcm9tKE9wdGlvbmFsPEludGVybmFsPiYmIGludGVybmFsKQorc3RkOjp1bmlxdWVfcHRy PFJUQ1J0cFRyYW5zZm9ybT4gUlRDUnRwVHJhbnNmb3JtOjpmcm9tKE9wdGlvbmFsPEludGVybmFs PiYmIGludGVybmFsKQogewogICAgIGlmICghaW50ZXJuYWwpCi0gICAgICAgIHJldHVybiB7IH07 Ci0gICAgcmV0dXJuIFJUQ1J0cFRyYW5zZm9ybShXVEZNb3ZlKCppbnRlcm5hbCkpOworICAgICAg ICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZTxSVENSdHBUcmFuc2Zvcm0+ KFdURk1vdmUoKmludGVybmFsKSk7CiB9CiAKIFJUQ1J0cFRyYW5zZm9ybTo6UlRDUnRwVHJhbnNm b3JtKEludGVybmFsJiYgdHJhbnNmb3JtKQpAQCAtNTksMzIgKzU5LDUwIEBAIGJvb2wgUlRDUnRw VHJhbnNmb3JtOjppc0F0dGFjaGVkKCkgY29uc3QKICAgICB9KTsKIH0KIAotdm9pZCBSVENSdHBU cmFuc2Zvcm06OmF0dGFjaFRvUmVjZWl2ZXIoUlRDUnRwUmVjZWl2ZXImIHJlY2VpdmVyKQordm9p ZCBSVENSdHBUcmFuc2Zvcm06OmF0dGFjaFRvUmVjZWl2ZXIoUlRDUnRwUmVjZWl2ZXImIHJlY2Vp dmVyLCBSVENSdHBUcmFuc2Zvcm0qIHByZXZpb3VzVHJhbnNmb3JtKQogewogICAgIEFTU0VSVCgh aXNBdHRhY2hlZCgpKTsKLSAgICBpZiAoYXV0byogYmFja2VuZCA9IHJlY2VpdmVyLmJhY2tlbmQo KSkKLSAgICAgICAgbV9iYWNrZW5kID0gYmFja2VuZC0+Y3JlYXRlUlRDUnRwVHJhbnNmb3JtQmFj a2VuZCgpOwotICAgIGlmIChtX2JhY2tlbmQpIHsKLSAgICAgICAgc3dpdGNoT24obV90cmFuc2Zv cm0sIFsmXShSZWZQdHI8UlRDUnRwU0ZyYW1lVHJhbnNmb3JtPiYgc2ZyYW1lVHJhbnNmb3JtKSB7 Ci0gICAgICAgICAgICBzZnJhbWVUcmFuc2Zvcm0tPmluaXRpYWxpemVCYWNrZW5kRm9yUmVjZWl2 ZXIoKm1fYmFja2VuZCk7Ci0gICAgICAgIH0sIFsmXShSZWZQdHI8UlRDUnRwU2NyaXB0VHJhbnNm b3JtPiYgc2NyaXB0VHJhbnNmb3JtKSB7Ci0gICAgICAgICAgICBzY3JpcHRUcmFuc2Zvcm0tPmlu aXRpYWxpemVCYWNrZW5kRm9yUmVjZWl2ZXIoKm1fYmFja2VuZCk7Ci0gICAgICAgIH0pOwotICAg IH0KKworICAgIGlmIChwcmV2aW91c1RyYW5zZm9ybSkKKyAgICAgICAgbV9iYWNrZW5kID0gcHJl dmlvdXNUcmFuc2Zvcm0tPnRha2VCYWNrZW5kKCk7CisgICAgZWxzZSBpZiAoYXV0byogYmFja2Vu ZCA9IHJlY2VpdmVyLmJhY2tlbmQoKSkKKyAgICAgICAgbV9iYWNrZW5kID0gYmFja2VuZC0+cnRj UnRwVHJhbnNmb3JtQmFja2VuZCgpOworICAgIGVsc2UKKyAgICAgICAgcmV0dXJuOworCisgICAg c3dpdGNoT24obV90cmFuc2Zvcm0sIFsmXShSZWZQdHI8UlRDUnRwU0ZyYW1lVHJhbnNmb3JtPiYg c2ZyYW1lVHJhbnNmb3JtKSB7CisgICAgICAgIHNmcmFtZVRyYW5zZm9ybS0+aW5pdGlhbGl6ZUJh Y2tlbmRGb3JSZWNlaXZlcigqbV9iYWNrZW5kKTsKKyAgICB9LCBbJl0oUmVmUHRyPFJUQ1J0cFNj cmlwdFRyYW5zZm9ybT4mIHNjcmlwdFRyYW5zZm9ybSkgeworICAgICAgICBzY3JpcHRUcmFuc2Zv cm0tPmluaXRpYWxpemVCYWNrZW5kRm9yUmVjZWl2ZXIoKm1fYmFja2VuZCk7CisgICAgfSk7CiB9 CiAKLXZvaWQgUlRDUnRwVHJhbnNmb3JtOjphdHRhY2hUb1NlbmRlcihSVENSdHBTZW5kZXImIHNl bmRlcikKK3ZvaWQgUlRDUnRwVHJhbnNmb3JtOjphdHRhY2hUb1NlbmRlcihSVENSdHBTZW5kZXIm IHNlbmRlciwgUlRDUnRwVHJhbnNmb3JtKiBwcmV2aW91c1RyYW5zZm9ybSkKIHsKICAgICBBU1NF UlQoIWlzQXR0YWNoZWQoKSk7Ci0gICAgaWYgKGF1dG8qIGJhY2tlbmQgPSBzZW5kZXIuYmFja2Vu ZCgpKQotICAgICAgICBtX2JhY2tlbmQgPSBiYWNrZW5kLT5jcmVhdGVSVENSdHBUcmFuc2Zvcm1C YWNrZW5kKCk7Ci0gICAgaWYgKG1fYmFja2VuZCkgewotICAgICAgICBzd2l0Y2hPbihtX3RyYW5z Zm9ybSwgWyZdKFJlZlB0cjxSVENSdHBTRnJhbWVUcmFuc2Zvcm0+JiBzZnJhbWVUcmFuc2Zvcm0p IHsKLSAgICAgICAgICAgIHNmcmFtZVRyYW5zZm9ybS0+aW5pdGlhbGl6ZUJhY2tlbmRGb3JTZW5k ZXIoKm1fYmFja2VuZCk7Ci0gICAgICAgIH0sIFsmXShSZWZQdHI8UlRDUnRwU2NyaXB0VHJhbnNm b3JtPiYgc2NyaXB0VHJhbnNmb3JtKSB7Ci0gICAgICAgICAgICBzY3JpcHRUcmFuc2Zvcm0tPmlu aXRpYWxpemVCYWNrZW5kRm9yU2VuZGVyKCptX2JhY2tlbmQpOwotICAgICAgICB9KTsKLSAgICB9 CisKKyAgICBpZiAocHJldmlvdXNUcmFuc2Zvcm0pCisgICAgICAgIG1fYmFja2VuZCA9IHByZXZp b3VzVHJhbnNmb3JtLT50YWtlQmFja2VuZCgpOworICAgIGVsc2UgaWYgKGF1dG8qIGJhY2tlbmQg PSBzZW5kZXIuYmFja2VuZCgpKQorICAgICAgICBtX2JhY2tlbmQgPSBiYWNrZW5kLT5ydGNSdHBU cmFuc2Zvcm1CYWNrZW5kKCk7CisgICAgZWxzZQorICAgICAgICByZXR1cm47CisKKyAgICBzd2l0 Y2hPbihtX3RyYW5zZm9ybSwgWyZdKFJlZlB0cjxSVENSdHBTRnJhbWVUcmFuc2Zvcm0+JiBzZnJh bWVUcmFuc2Zvcm0pIHsKKyAgICAgICAgc2ZyYW1lVHJhbnNmb3JtLT5pbml0aWFsaXplQmFja2Vu ZEZvclNlbmRlcigqbV9iYWNrZW5kKTsKKyAgICB9LCBbJl0oUmVmUHRyPFJUQ1J0cFNjcmlwdFRy YW5zZm9ybT4mIHNjcmlwdFRyYW5zZm9ybSkgeworICAgICAgICBzY3JpcHRUcmFuc2Zvcm0tPmlu aXRpYWxpemVCYWNrZW5kRm9yU2VuZGVyKCptX2JhY2tlbmQpOworICAgICAgICBpZiAocHJldmlv dXNUcmFuc2Zvcm0pCisgICAgICAgICAgICBwcmV2aW91c1RyYW5zZm9ybS0+YmFja2VuZFRyYW5z ZmVyZWRUb05ld1RyYW5zZm9ybSgpOworICAgIH0pOworfQorCit2b2lkIFJUQ1J0cFRyYW5zZm9y bTo6YmFja2VuZFRyYW5zZmVyZWRUb05ld1RyYW5zZm9ybSgpCit7CisgICAgc3dpdGNoT24obV90 cmFuc2Zvcm0sIFsmXShSZWZQdHI8UlRDUnRwU0ZyYW1lVHJhbnNmb3JtPiYpIHsKKyAgICB9LCBb Jl0oUmVmUHRyPFJUQ1J0cFNjcmlwdFRyYW5zZm9ybT4mIHNjcmlwdFRyYW5zZm9ybSkgeworICAg ICAgICBzY3JpcHRUcmFuc2Zvcm0tPmJhY2tlbmRUcmFuc2ZlcmVkVG9OZXdUcmFuc2Zvcm0oKTsK KyAgICB9KTsKIH0KIAogdm9pZCBSVENSdHBUcmFuc2Zvcm06OmNsZWFyQmFja2VuZCgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFRyYW5zZm9y bS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBUcmFuc2Zvcm0u aAppbmRleCA2MWI5MWVhY2U4NjhjZDdhYzc0Y2M0NGMzOTJiOTVmYzBhMjliZWJmLi4yNGYyZGIw M2JhOTc5MDFhYTJmMTAxYjlkMTI5ODM5ZDdhNWJlM2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFRyYW5zZm9ybS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwVHJhbnNmb3JtLmgKQEAgLTMwLDYgKzMw LDcgQEAKICNpbmNsdWRlICJSVENSdHBTRnJhbWVUcmFuc2Zvcm0uaCIKICNpbmNsdWRlICJSVENS dHBTY3JpcHRUcmFuc2Zvcm0uaCIKICNpbmNsdWRlICJSVENSdHBUcmFuc2Zvcm1CYWNrZW5kLmgi CisjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC0zNywyNSArMzgsMjggQEAgY2xhc3MgUlRDUnRwUmVjZWl2ZXI7CiBjbGFzcyBSVENSdHBTZW5k ZXI7CiAKIGNsYXNzIFJUQ1J0cFRyYW5zZm9ybSAgeworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogcHVibGljOgogICAgIHVzaW5nIEludGVybmFsID0gVmFyaWFudDxSZWZQdHI8UlRDUnRw U0ZyYW1lVHJhbnNmb3JtPiwgUmVmUHRyPFJUQ1J0cFNjcmlwdFRyYW5zZm9ybT4+OwotICAgIHN0 YXRpYyBPcHRpb25hbDxSVENSdHBUcmFuc2Zvcm0+IGZyb20oT3B0aW9uYWw8SW50ZXJuYWw+JiYp OworICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UlRDUnRwVHJhbnNmb3JtPiBmcm9tKE9wdGlv bmFsPEludGVybmFsPiYmKTsKIAogICAgIGV4cGxpY2l0IFJUQ1J0cFRyYW5zZm9ybShJbnRlcm5h bCYmKTsKICAgICB+UlRDUnRwVHJhbnNmb3JtKCk7CiAKICAgICBib29sIGlzQXR0YWNoZWQoKSBj b25zdDsKLSAgICB2b2lkIGF0dGFjaFRvUmVjZWl2ZXIoUlRDUnRwUmVjZWl2ZXImKTsKLSAgICB2 b2lkIGF0dGFjaFRvU2VuZGVyKFJUQ1J0cFNlbmRlciYpOworICAgIHZvaWQgYXR0YWNoVG9SZWNl aXZlcihSVENSdHBSZWNlaXZlciYsIFJUQ1J0cFRyYW5zZm9ybSopOworICAgIHZvaWQgYXR0YWNo VG9TZW5kZXIoUlRDUnRwU2VuZGVyJiwgUlRDUnRwVHJhbnNmb3JtKik7CiAgICAgdm9pZCBkZXRh Y2hGcm9tUmVjZWl2ZXIoUlRDUnRwUmVjZWl2ZXImKTsKICAgICB2b2lkIGRldGFjaEZyb21TZW5k ZXIoUlRDUnRwU2VuZGVyJik7CiAKKyAgICBSZWZQdHI8UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4g dGFrZUJhY2tlbmQoKSB7IHJldHVybiBXVEZNb3ZlKG1fYmFja2VuZCk7IH0KICAgICBJbnRlcm5h bCBpbnRlcm5hbFRyYW5zZm9ybSgpIHsgcmV0dXJuIG1fdHJhbnNmb3JtOyB9CiAKICAgICBmcmll bmQgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFJUQ1J0cFRyYW5zZm9ybSYsIGNvbnN0IFJUQ1J0cFRy YW5zZm9ybSYpOwogCiBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJCYWNrZW5kKCk7CisgICAgdm9p ZCBiYWNrZW5kVHJhbnNmZXJlZFRvTmV3VHJhbnNmb3JtKCk7CiAKICAgICBSZWZQdHI8UlRDUnRw VHJhbnNmb3JtQmFja2VuZD4gbV9iYWNrZW5kOwogICAgIEludGVybmFsIG1fdHJhbnNmb3JtOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDUnRwUmVjZWl2ZXJCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFJlY2VpdmVyQmFja2VuZC5jcHAKaW5k ZXggOWE4OGQxY2RjMGViYjBkYzc5YjA0Y2I1MWIwNGVmNmVhMGYzZTU5Mi4uZjNlNGViMjY2ZDM3 NDJhMmI2ZDUyMjE1NDE0MDI5OGFhZmU4YzczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwUmVjZWl2ZXJCYWNrZW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9M aWJXZWJSVENSdHBSZWNlaXZlckJhY2tlbmQuY3BwCkBAIC0xMTYsOSArMTE2LDExIEBAIFJlZjxS ZWFsdGltZU1lZGlhU291cmNlPiBMaWJXZWJSVENSdHBSZWNlaXZlckJhY2tlbmQ6OmNyZWF0ZVNv dXJjZSgpCiAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotUmVmPFJUQ1J0 cFRyYW5zZm9ybUJhY2tlbmQ+IExpYldlYlJUQ1J0cFJlY2VpdmVyQmFja2VuZDo6Y3JlYXRlUlRD UnRwVHJhbnNmb3JtQmFja2VuZCgpCitSZWY8UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4gTGliV2Vi UlRDUnRwUmVjZWl2ZXJCYWNrZW5kOjpydGNSdHBUcmFuc2Zvcm1CYWNrZW5kKCkKIHsKLSAgICBy ZXR1cm4gTGliV2ViUlRDUnRwUmVjZWl2ZXJUcmFuc2Zvcm1CYWNrZW5kOjpjcmVhdGUobV9ydGNS ZWNlaXZlcik7CisgICAgaWYgKCFtX3RyYW5zZm9ybUJhY2tlbmQpCisgICAgICAgIG1fdHJhbnNm b3JtQmFja2VuZCA9IExpYldlYlJUQ1J0cFJlY2VpdmVyVHJhbnNmb3JtQmFja2VuZDo6Y3JlYXRl KG1fcnRjUmVjZWl2ZXIpOworICAgIHJldHVybiAqbV90cmFuc2Zvcm1CYWNrZW5kOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENSdHBSZWNlaXZlckJhY2tlbmQuaCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFJl Y2VpdmVyQmFja2VuZC5oCmluZGV4IGI0NmNkMmE2OTg0ZGVkOWQxMTk0NzU1NWQyMDUxODc3YzEw NTg3NDAuLmY2YzZjMTlmZjMwM2Y2ZTA4ZWE1NjI0MTJmYWY5MTY3NDJlZGJjZGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJU Q1J0cFJlY2VpdmVyQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFJlY2VpdmVyQmFja2VuZC5oCkBAIC01Miw5ICs1 MiwxMCBAQCBwcml2YXRlOgogICAgIFJUQ1J0cFBhcmFtZXRlcnMgZ2V0UGFyYW1ldGVycygpIGZp bmFsOwogICAgIFZlY3RvcjxSVENSdHBDb250cmlidXRpbmdTb3VyY2U+IGdldENvbnRyaWJ1dGlu Z1NvdXJjZXMoKSBjb25zdCBmaW5hbDsKICAgICBWZWN0b3I8UlRDUnRwU3luY2hyb25pemF0aW9u U291cmNlPiBnZXRTeW5jaHJvbml6YXRpb25Tb3VyY2VzKCkgY29uc3QgZmluYWw7Ci0gICAgUmVm PFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQ+IGNyZWF0ZVJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQoKSBm aW5hbDsKKyAgICBSZWY8UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4gcnRjUnRwVHJhbnNmb3JtQmFj a2VuZCgpIGZpbmFsOwogCiAgICAgcnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2 ZXJJbnRlcmZhY2U+IG1fcnRjUmVjZWl2ZXI7CisgICAgUmVmUHRyPFJUQ1J0cFRyYW5zZm9ybUJh Y2tlbmQ+IG1fdHJhbnNmb3JtQmFja2VuZDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKaW5kZXgg MzY5MGQ5NGMxNDA5YmMwNjM4NzVlNTljY2NlZmM1ZTc3YzRmNjNiMy4uY2EyMmYwYThjOTNkZGVl OTI5MDVhNDE3MDlmNDc5Y2I2NzViZjVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2Vi UlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKQEAgLTM5LDYgKzM5LDEyIEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6TGliV2ViUlRDUnRwU2VuZGVy QmFja2VuZChMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQmIGJhY2tlbmQsIHJ0Yzo6c2Nv cGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFNlbmRlckludGVyZmFjZT4mJiBydGNTZW5kZXIpCisgICAg OiBtX3BlZXJDb25uZWN0aW9uQmFja2VuZChtYWtlV2Vha1B0cigmYmFja2VuZCkpCisgICAgLCBt X3J0Y1NlbmRlcihXVEZNb3ZlKHJ0Y1NlbmRlcikpCit7Cit9CisKIExpYldlYlJUQ1J0cFNlbmRl ckJhY2tlbmQ6OkxpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQoTGliV2ViUlRDUGVlckNvbm5lY3Rp b25CYWNrZW5kJiBiYWNrZW5kLCBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBTZW5kZXJJ bnRlcmZhY2U+JiYgcnRjU2VuZGVyLCBTb3VyY2UmJiBzb3VyY2UpCiAgICAgOiBtX3BlZXJDb25u ZWN0aW9uQmFja2VuZChtYWtlV2Vha1B0cigmYmFja2VuZCkpCiAgICAgLCBtX3J0Y1NlbmRlcihX VEZNb3ZlKHJ0Y1NlbmRlcikpCkBAIC0xNTQsOSArMTYwLDExIEBAIHN0ZDo6dW5pcXVlX3B0cjxS VENEVE1GU2VuZGVyQmFja2VuZD4gTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6Y3JlYXRlRFRN RkJhY2tlCiAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGliV2ViUlRDRFRNRlNlbmRlckJhY2tlbmQ+ KG1fcnRjU2VuZGVyLT5HZXREdG1mU2VuZGVyKCkpOwogfQogCi1SZWY8UlRDUnRwVHJhbnNmb3Jt QmFja2VuZD4gTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6Y3JlYXRlUlRDUnRwVHJhbnNmb3Jt QmFja2VuZCgpCitSZWY8UlRDUnRwVHJhbnNmb3JtQmFja2VuZD4gTGliV2ViUlRDUnRwU2VuZGVy QmFja2VuZDo6cnRjUnRwVHJhbnNmb3JtQmFja2VuZCgpCiB7Ci0gICAgcmV0dXJuIExpYldlYlJU Q1J0cFNlbmRlclRyYW5zZm9ybUJhY2tlbmQ6OmNyZWF0ZShtX3J0Y1NlbmRlcik7CisgICAgaWYg KCFtX3RyYW5zZm9ybUJhY2tlbmQpCisgICAgICAgIG1fdHJhbnNmb3JtQmFja2VuZCA9IExpYldl YlJUQ1J0cFNlbmRlclRyYW5zZm9ybUJhY2tlbmQ6OmNyZWF0ZShtX3J0Y1NlbmRlcik7CisgICAg cmV0dXJuICptX3RyYW5zZm9ybUJhY2tlbmQ7CiB9CiAKIHZvaWQgTGliV2ViUlRDUnRwU2VuZGVy QmFja2VuZDo6c2V0TWVkaWFTdHJlYW1JZHMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHN0cmVhbUlk cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuaAppbmRleCA4 NDcxOTJkZWY5NmIzZWIyMTQ3NzRmMjExOTI1MmViZDIxZWQzNTU4Li43YjNmNTliYzM4OWE3MmVj OTAxZWFhNWYwNjRjOWEyZWQ0M2MzNzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD UnRwU2VuZGVyQmFja2VuZC5oCkBAIC00NywxNCArNDcsOSBAQCBjbGFzcyBMaWJXZWJSVENQZWVy Q29ubmVjdGlvbkJhY2tlbmQ7CiBjbGFzcyBMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kIGZpbmFs IDogcHVibGljIFJUQ1J0cFNlbmRlckJhY2tlbmQsIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxMaWJX ZWJSVENSdHBTZW5kZXJCYWNrZW5kPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBw dWJsaWM6Ci0gICAgTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZChMaWJXZWJSVENQZWVyQ29ubmVj dGlvbkJhY2tlbmQmIGJhY2tlbmQsIHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFNlbmRl ckludGVyZmFjZT4mJiBydGNTZW5kZXIpCi0gICAgICAgIDogbV9wZWVyQ29ubmVjdGlvbkJhY2tl bmQobWFrZVdlYWtQdHIoJmJhY2tlbmQpKQotICAgICAgICAsIG1fcnRjU2VuZGVyKFdURk1vdmUo cnRjU2VuZGVyKSkKLSAgICB7Ci0gICAgfQotCiAgICAgdXNpbmcgU291cmNlID0gVmFyaWFudDxz dGQ6Om51bGxwdHJfdCwgUmVmPFJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZT4sIFJlZjxSZWFs dGltZU91dGdvaW5nVmlkZW9Tb3VyY2U+PjsKICAgICBMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5k KExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZCYsIHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJy dGM6OlJ0cFNlbmRlckludGVyZmFjZT4mJiwgU291cmNlJiYpOworICAgIExpYldlYlJUQ1J0cFNl bmRlckJhY2tlbmQoTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kJiwgcnRjOjpzY29wZWRf cmVmcHRyPHdlYnJ0Yzo6UnRwU2VuZGVySW50ZXJmYWNlPiYmKTsKICAgICB+TGliV2ViUlRDUnRw U2VuZGVyQmFja2VuZCgpOwogCiAgICAgdm9pZCBzZXRSVENTZW5kZXIocnRjOjpzY29wZWRfcmVm cHRyPHdlYnJ0Yzo6UnRwU2VuZGVySW50ZXJmYWNlPiYmIHJ0Y1NlbmRlcikgeyBtX3J0Y1NlbmRl ciA9IFdURk1vdmUocnRjU2VuZGVyKTsgfQpAQCAtNzAsNyArNjUsNyBAQCBwcml2YXRlOgogICAg IFJUQ1J0cFNlbmRQYXJhbWV0ZXJzIGdldFBhcmFtZXRlcnMoKSBjb25zdCBmaW5hbDsKICAgICB2 b2lkIHNldFBhcmFtZXRlcnMoY29uc3QgUlRDUnRwU2VuZFBhcmFtZXRlcnMmLCBET01Qcm9taXNl RGVmZXJyZWQ8dm9pZD4mJikgZmluYWw7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJUQ0RUTUZTZW5k ZXJCYWNrZW5kPiBjcmVhdGVEVE1GQmFja2VuZCgpIGZpbmFsOwotICAgIFJlZjxSVENSdHBUcmFu c2Zvcm1CYWNrZW5kPiBjcmVhdGVSVENSdHBUcmFuc2Zvcm1CYWNrZW5kKCkgZmluYWw7CisgICAg UmVmPFJUQ1J0cFRyYW5zZm9ybUJhY2tlbmQ+IHJ0Y1J0cFRyYW5zZm9ybUJhY2tlbmQoKSBmaW5h bDsKICAgICB2b2lkIHNldE1lZGlhU3RyZWFtSWRzKGNvbnN0IFZlY3RvcjxTdHJpbmc+JikgZmlu YWw7CiAKICAgICB2b2lkIHN0YXJ0U291cmNlKCk7CkBAIC04MCw2ICs3NSw3IEBAIHByaXZhdGU6 CiAgICAgV2Vha1B0cjxMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ+IG1fcGVlckNvbm5l Y3Rpb25CYWNrZW5kOwogICAgIHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6OlJ0cFNlbmRlcklu dGVyZmFjZT4gbV9ydGNTZW5kZXI7CiAgICAgU291cmNlIG1fc291cmNlOworICAgIFJlZlB0cjxS VENSdHBUcmFuc2Zvcm1CYWNrZW5kPiBtX3RyYW5zZm9ybUJhY2tlbmQ7CiAgICAgbXV0YWJsZSBP cHRpb25hbDx3ZWJydGM6OlJ0cFBhcmFtZXRlcnM+IG1fY3VycmVudFBhcmFtZXRlcnM7CiB9Owog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNmM3N2YwYmYwZDgzNDc4MjY5ODA2NzQzMzkyMWQ5ODU0Yzk2MDFkZC4uNDViMWM0 ZWFlMjhjNWVlYmVlM2QxNzcxMmEzZTc5ZjZjMWNjMjJhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIxLTA0LTA5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAg ICBNYWtlIHN1cmUgYWxsIGZyYW1lcyBnZXQgdHJhbnNmb3JtZWQgd2hlbiBvdmVycmlkaW5nIGEg dHJhbnNmb3JtIHdpdGggYW5vdGhlciBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNDM2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaHR0cC93cHQvd2VicnRjL2NoYW5nZS1lbmNvZGVkLXRyYW5z Zm9ybS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L3dlYnJ0Yy9jaGFu Z2UtZW5jb2RlZC10cmFuc2Zvcm0uaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC93cHQvd2Vi cnRjL2NoYW5nZS1lbmNvZGVkLXRyYW5zZm9ybS5qczogQWRkZWQuCisgICAgICAgIChhcHBlbmRU b0J1ZmZlcik6CisgICAgICAgIChvbnJ0Y3RyYW5zZm9ybS5wcm9jZXNzKToKKyAgICAgICAgKG9u cnRjdHJhbnNmb3JtKToKKwogMjAyMS0wNC0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgVXBkYXRlIFNGcmFtZSBpbXBsZW1lbnRhdGlvbiB0byBsYXRlc3Qg dmVyc2lvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL2NoYW5nZS1l bmNvZGVkLXRyYW5zZm9ybS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJy dGMvY2hhbmdlLWVuY29kZWQtdHJhbnNmb3JtLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zM2Vm NDgzZmQ5ZWVjYTRlODlmM2I5Yjk1ODdlNzA0NmI0OGQxYTkzCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL2NoYW5nZS1lbmNvZGVkLXRyYW5zZm9ybS1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKKworUEFTUyBjaGFuZ2Ugc2VuZGVyIHRyYW5zZm9y bQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJydGMvY2hhbmdlLWVuY29k ZWQtdHJhbnNmb3JtLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJydGMvY2hhbmdlLWVu Y29kZWQtdHJhbnNmb3JtLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2ZhY2Y1NjRlNzg5OGNmODM1M2U1NDVh ZTQ0MWM3MmYyZjM3ZGY4MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0 L3dlYnJ0Yy9jaGFuZ2UtZW5jb2RlZC10cmFuc2Zvcm0uaHRtbApAQCAtMCwwICsxLDU3IEBACis8 IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0 PSJ1dGYtOCI+CisgICAgICAgIDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpz Ij48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3Ny ZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHZp ZGVvIGlkPSJ2aWRlbzEiIGF1dG9wbGF5IGNvbnRyb2xzIHBsYXlzaW5saW5lPjwvdmlkZW8+Cisg ICAgICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2Ny aXB0PgorYXN5bmMgZnVuY3Rpb24gd2FpdEZvck1lc3NhZ2Uod29ya2VyLCBkYXRhKQoreworICAg IHdoaWxlICh0cnVlKSB7CisgICAgICAgIGNvbnN0IHJlY2VpdmVkID0gYXdhaXQgbmV3IFByb21p c2UocmVzb2x2ZSA9PiB3b3JrZXIub25tZXNzYWdlID0gKGV2ZW50KSA9PiByZXNvbHZlKGV2ZW50 LmRhdGEpKTsKKyAgICAgICAgaWYgKGRhdGEgPT09IHJlY2VpdmVkKQorICAgICAgICAgICAgcmV0 dXJuOworICAgIH0KK30KKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgd29y a2VyID0gbmV3IFdvcmtlcignY2hhbmdlLWVuY29kZWQtdHJhbnNmb3JtLmpzJyk7CisgICAgY29u c3QgZGF0YSA9IGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gd29ya2VyLm9ubWVzc2FnZSA9 IChldmVudCkgPT4gcmVzb2x2ZShldmVudC5kYXRhKSk7CisgICAgYXNzZXJ0X2VxdWFscyhkYXRh LCAicmVnaXN0ZXJlZCIpOworCisgICAgY29uc3QgbG9jYWxTdHJlYW0gPSBhd2FpdCBuYXZpZ2F0 b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7dmlkZW86IHRydWV9KTsKKworICAgIGxldCBz ZW5kZXIsIHJlY2VpdmVyOworICAgIGNvbnN0IHNlbmRlclRyYW5zZm9ybTEgPSBuZXcgUlRDUnRw U2NyaXB0VHJhbnNmb3JtKHdvcmtlciwge25hbWU6J3NlbmRlcjEnfSk7CisgICAgY29uc3Qgc2Vu ZGVyVHJhbnNmb3JtMiA9IG5ldyBSVENSdHBTY3JpcHRUcmFuc2Zvcm0od29ya2VyLCB7bmFtZTon c2VuZGVyMid9KTsKKyAgICBjb25zdCByZWNlaXZlclRyYW5zZm9ybSA9IG5ldyBSVENSdHBTY3Jp cHRUcmFuc2Zvcm0od29ya2VyLCB7bmFtZToncmVjZWl2ZXInfSk7CisKKyAgICBjb25zdCBzdHJl YW0gPSBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNy ZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIHNlbmRl ciA9IGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayhsb2NhbFN0cmVhbS5nZXRWaWRlb1RyYWNrcygp WzBdLCBsb2NhbFN0cmVhbSk7CisgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uZ2V0VHJhbnNj ZWl2ZXJzKClbMF0uc2V0Q29kZWNQcmVmZXJlbmNlcyhbe21pbWVUeXBlOiAidmlkZW8vVlA4Iiwg Y2xvY2tSYXRlOiA5MDAwMH1dKTsKKyAgICAgICAgICAgIHNlbmRlci50cmFuc2Zvcm0gPSBzZW5k ZXJUcmFuc2Zvcm0xOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAg ICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKKyAgICAg ICAgICAgICAgICByZWNlaXZlciA9IHRyYWNrRXZlbnQucmVjZWl2ZXI7CisgICAgICAgICAgICAg ICAgcmVjZWl2ZXIudHJhbnNmb3JtID0gcmVjZWl2ZXJUcmFuc2Zvcm07CisgICAgICAgICAgICAg ICAgcmVzb2x2ZSh0cmFja0V2ZW50LnN0cmVhbXNbMF0pOworICAgICAgICAgICAgfTsKKyAgICAg ICAgfSk7CisgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJUZXN0IHRpbWVkIG91dCIp LCA1MDAwKTsKKyAgICB9KTsKKworICAgIHZpZGVvMS5zcmNPYmplY3QgPSBzdHJlYW07CisgICAg YXdhaXQgdmlkZW8xLnBsYXkoKTsKKworICAgIGNvbnN0IHVwZGF0ZVByb21pc2UgPSBuZXcgUHJv bWlzZShyZXNvbHZlID0+IHdvcmtlci5vbm1lc3NhZ2UgPSAoZXZlbnQpID0+IHJlc29sdmUoZXZl bnQuZGF0YSkpOworICAgIHNlbmRlci50cmFuc2Zvcm0gPSBzZW5kZXJUcmFuc2Zvcm0yOworICAg IGFzc2VydF9lcXVhbHMoYXdhaXQgdXBkYXRlUHJvbWlzZSwgImdvdCB2YWx1ZSAyIik7Cit9LCAi Y2hhbmdlIHNlbmRlciB0cmFuc2Zvcm0iKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2VicnRjL2NoYW5n ZS1lbmNvZGVkLXRyYW5zZm9ybS5qcyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYnJ0Yy9jaGFu Z2UtZW5jb2RlZC10cmFuc2Zvcm0uanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODRhN2FhYWMxODFkYjRjZTJhYmRh YzI5NWZhYTE1NTUxOTZlOWI5YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAv d3B0L3dlYnJ0Yy9jaGFuZ2UtZW5jb2RlZC10cmFuc2Zvcm0uanMKQEAgLTAsMCArMSwzOSBAQAor ZnVuY3Rpb24gYXBwZW5kVG9CdWZmZXIoYnVmZmVyLCB2YWx1ZSkgeworICAgIGNvbnN0IHJlc3Vs dCA9IG5ldyBBcnJheUJ1ZmZlcihidWZmZXIuYnl0ZUxlbmd0aCArIDEpOworICAgIGNvbnN0IGJ5 dGVSZXN1bHQgPSBuZXcgVWludDhBcnJheShyZXN1bHQpOworICAgIGJ5dGVSZXN1bHQuc2V0KG5l dyBVaW50OEFycmF5KGJ1ZmZlciksIDApOworICAgIGJ5dGVSZXN1bHRbYnVmZmVyLmJ5dGVMZW5n dGhdID0gdmFsdWU7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKworb25ydGN0cmFuc2Zvcm0gPSAo ZXZlbnQpID0+IHsKKyAgICBjb25zdCB0cmFuc2Zvcm1lciA9IGV2ZW50LnRyYW5zZm9ybWVyOwor CisgICAgdHJhbnNmb3JtZXIucmVhZGVyID0gdHJhbnNmb3JtZXIucmVhZGFibGUuZ2V0UmVhZGVy KCk7CisgICAgdHJhbnNmb3JtZXIud3JpdGVyID0gdHJhbnNmb3JtZXIud3JpdGFibGUuZ2V0V3Jp dGVyKCk7CisKKyAgICBmdW5jdGlvbiBwcm9jZXNzKHRyYW5zZm9ybWVyKQorICAgIHsKKyAgICAg ICAgdHJhbnNmb3JtZXIucmVhZGVyLnJlYWQoKS50aGVuKGNodW5rID0+IHsKKyAgICAgICAgICAg IGlmIChjaHVuay5kb25lKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGlm ICh0cmFuc2Zvcm1lci5vcHRpb25zLm5hbWUgPT09ICdzZW5kZXIxJykKKyAgICAgICAgICAgICAg ICBjaHVuay52YWx1ZS5kYXRhID0gYXBwZW5kVG9CdWZmZXIoY2h1bmsudmFsdWUuZGF0YSwgMSk7 CisgICAgICAgICAgICBlbHNlIGlmICh0cmFuc2Zvcm1lci5vcHRpb25zLm5hbWUgPT09ICdzZW5k ZXIyJykKKyAgICAgICAgICAgICAgICBjaHVuay52YWx1ZS5kYXRhID0gYXBwZW5kVG9CdWZmZXIo Y2h1bmsudmFsdWUuZGF0YSwgMik7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAg ICBjb25zdCB2YWx1ZSA9IG5ldyBVaW50OEFycmF5KGNodW5rLnZhbHVlLmRhdGEpW2NodW5rLnZh bHVlLmRhdGEuYnl0ZUxlbmd0aCAtIDFdOworICAgICAgICAgICAgICAgIGlmICh2YWx1ZSAhPT0g MSAmJiB2YWx1ZSAhPT0gMikKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5wb3N0TWVzc2FnZSgi dW5leHBlY3RlZCB2YWx1ZTogIiArIHZhbHVlKTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmICh2 YWx1ZSA9PT0gMikKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5wb3N0TWVzc2FnZSgiZ290IHZh bHVlIDIiKTsKKyAgICAgICAgICAgICAgICBjaHVuay52YWx1ZS5kYXRhID0gY2h1bmsudmFsdWUu ZGF0YS5zbGljZSgwLCBjaHVuay52YWx1ZS5kYXRhLmJ5dGVMZW5ndGggLSAxKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHRyYW5zZm9ybWVyLndyaXRlci53cml0ZShjaHVuay52YWx1ZSk7 CisgICAgICAgICAgICBwcm9jZXNzKHRyYW5zZm9ybWVyKTsKKyAgICAgICAgfSk7CisgICAgfQor CisgICAgcHJvY2Vzcyh0cmFuc2Zvcm1lcik7Cit9Oworc2VsZi5wb3N0TWVzc2FnZSgicmVnaXN0 ZXJlZCIpOwo=