184747 2018-04-18 12:05:25 -0700 REGRESSION(r230743): causes mouse clicks to not work on some platforms (Requested by brrian on #webkit). 2018-04-18 12:20:54 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184462 1 commit-queue commit-queue bburg cgarcia webkit-bug-importer oldest_to_newest 1415632 0 commit-queue 2018-04-18 12:05:25 -0700 https://trac.webkit.org/changeset/230743 broke the build: causes mouse clicks to not work on some platforms (Requested by brrian on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1415634 1 338237 commit-queue 2018-04-18 12:05:32 -0700 Created attachment 338237 ROLLOUT of r230743 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1415639 2 bburg 2018-04-18 12:14:57 -0700 <rdar://problem/39528471> 1415640 3 bburg 2018-04-18 12:17:12 -0700 Committed r230773: <https://trac.webkit.org/changeset/230773> 338237 2018-04-18 12:05:32 -0700 2018-04-18 12:20:54 -0700 ROLLOUT of r230743 bug-184747-20180418150532.patch text/plain 19915 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE0YzU2NGIxZWU0M2Y3Yzhk ZDQ5Y2M5NjM0N2Y2OGVlM2Q4MDA2ZDcuLjVkZTE2N2E3MDBjZjgwZjU4NjA4ZjQyYWM3OTdmYjJh ZDIxNDlkNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDQtMTggIENvbW1pdCBR dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIyMzA3NDMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODQ3NDcKKworICAgICAgICBjYXVzZXMgbW91c2UgY2xpY2tzIHRvIG5vdCB3 b3JrIG9uIHNvbWUgcGxhdGZvcm1zIChSZXF1ZXN0ZWQKKyAgICAgICAgYnkgYnJyaWFuIG9uICN3 ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiV2ViIEF1 dG9tYXRpb246IHNpbXVsYXRlZCBtb3VzZSBpbnRlcmFjdGlvbnMgc2hvdWxkIG5vdCBiZQorICAg ICAgICBkb25lIHVudGlsIGFzc29jaWF0ZWQgRE9NIGV2ZW50cyBoYXZlIGJlZW4gZGlzcGF0Y2hl ZCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDQ2 MgorICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjMwNzQzCisKIDIw MTgtMDQtMTggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAg QXZvaWQgY3Jhc2ggaWYgSVRQIERlYnVnIG1vZGUgaXMgb24sIGJ1dCBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzIGFyZSBub3QgYmVpbmcgdXNlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0 Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCBm NTU4NTVjNmE1ZDExMDhhYWVmZTY0ZjZkMTNhNjE5MTgzZjBiMmNkLi40NTU2NmFjNjY1Njk4NmMz NWY2NDk2MGIxYzExODUyNjI5NDA2Zjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaApAQCAt NTEsNyArNTEsNiBAQCBleHRlcm4gIkMiIHsKICAgICBNKEtleUhhbmRsaW5nKSBcCiAgICAgTShM YXllcnMpIFwKICAgICBNKExvYWRpbmcpIFwKLSAgICBNKE1vdXNlSGFuZGxpbmcpIFwKICAgICBN KE5ldHdvcmspIFwKICAgICBNKE5ldHdvcmtDYWNoZSkgXAogICAgIE0oTmV0d29ya0NhY2hlU3Bl Y3VsYXRpdmVQcmVsb2FkaW5nKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCmluZGV4IDJiODExYjI2 Y2E5NDFmZjUxMDRiZGI1OWE0YmMzNzY3N2ZkZTBiZWUuLjQ4NWQ3NTU3NDEwNmIyZjg2MDVlY2Vh YWRlODdjMmMzM2VhOGIxNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1 dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCkBAIC01MywxNSArNTMs NiBAQCB1c2luZyBuYW1lc3BhY2UgSW5zcGVjdG9yOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot U3RyaW5nIEF1dG9tYXRpb25Db21tYW5kRXJyb3I6OnRvUHJvdG9jb2xTdHJpbmcoKSBjb25zdAot ewotICAgIFN0cmluZyBwcm90b2NvbEVycm9yTmFtZSA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1 dG9tYXRpb25IZWxwZXJzOjpnZXRFbnVtQ29uc3RhbnRWYWx1ZSh0eXBlKTsKLSAgICBpZiAoIW1l c3NhZ2UuaGFzX3ZhbHVlKCkpCi0gICAgICAgIHJldHVybiBwcm90b2NvbEVycm9yTmFtZTsKLQot ICAgIHJldHVybiBtYWtlU3RyaW5nKHByb3RvY29sRXJyb3JOYW1lLCBlcnJvck5hbWVBbmREZXRh aWxzU2VwYXJhdG9yLCBtZXNzYWdlLnZhbHVlKCkpOwotfQotICAgIAogLy8gwqc4LiBTZXNzaW9u cwogLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL3dlYmRyaXZlci8jZGZuLXNlc3Npb24tcGFnZS1s b2FkLXRpbWVvdXQKIHN0YXRpYyBjb25zdCBTZWNvbmRzIGRlZmF1bHRQYWdlTG9hZFRpbWVvdXQg PSAzMDBfczsKQEAgLTU5MiwyMCArNTgzLDYgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6 d2lsbFNob3dKYXZhU2NyaXB0RGlhbG9nKFdlYlBhZ2VQcm94eSYgcGFnZSkKICAgICAgICAgICAg ICAgICBjYWxsYmFjay0+c2VuZEZhaWx1cmUodW5leHBlY3RlZEFsZXJ0T3BlbkVycm9yKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICAKLSAgICAgICAgaWYgKCFtX3BlbmRpbmdN b3VzZUV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlLmlzRW1wdHkoKSkgewotICAgICAgICAg ICAgZm9yIChhdXRvIGtleSA6IGNvcHlUb1ZlY3RvcihtX3BlbmRpbmdNb3VzZUV2ZW50c0ZsdXNo ZWRDYWxsYmFja3NQZXJQYWdlLmtleXMoKSkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIGNhbGxi YWNrID0gbV9wZW5kaW5nTW91c2VFdmVudHNGbHVzaGVkQ2FsbGJhY2tzUGVyUGFnZS50YWtlKGtl eSk7Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2soc3RkOjpudWxsb3B0KTsKLSAgICAgICAgICAg IH0KLSAgICAgICAgfQotCi0gICAgICAgIGlmICghbV9wZW5kaW5nS2V5Ym9hcmRFdmVudHNGbHVz aGVkQ2FsbGJhY2tzUGVyUGFnZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGZvciAoYXV0byBr ZXkgOiBjb3B5VG9WZWN0b3IobV9wZW5kaW5nS2V5Ym9hcmRFdmVudHNGbHVzaGVkQ2FsbGJhY2tz UGVyUGFnZS5rZXlzKCkpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBjYWxsYmFjayA9IG1fcGVu ZGluZ0tleWJvYXJkRXZlbnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UudGFrZShrZXkpOwotICAg ICAgICAgICAgICAgIGNhbGxiYWNrKHN0ZDo6bnVsbG9wdCk7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KICAgICB9KTsKIH0KICAgICAKQEAgLTcyMSwyMyArNjk4LDEzIEBAIHZvaWQgV2ViQXV0 b21hdGlvblNlc3Npb246Omluc3BlY3RvckZyb250ZW5kTG9hZGVkKGNvbnN0IFdlYlBhZ2VQcm94 eSYgcGFnZSkKICAgICAgICAgY2FsbGJhY2stPnNlbmRTdWNjZXNzKEpTT046Ok9iamVjdDo6Y3Jl YXRlKCkpOwogfQogCi12b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjptb3VzZUV2ZW50c0ZsdXNo ZWRGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYgcGFnZSkKLXsKLSAgICBpZiAoYXV0byBjYWxs YmFjayA9IG1fcGVuZGluZ01vdXNlRXZlbnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UudGFrZShw YWdlLnBhZ2VJRCgpKSkgewotICAgICAgICBpZiAobV9wZW5kaW5nTW91c2VFdmVudHNGbHVzaGVk Q2FsbGJhY2tzUGVyUGFnZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBtX3NpbXVsYXRpbmdVc2Vy SW50ZXJhY3Rpb24gPSBmYWxzZTsKLQotICAgICAgICBjYWxsYmFjayhzdGQ6Om51bGxvcHQpOwot ICAgIH0KLX0KLQogdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6a2V5Ym9hcmRFdmVudHNGbHVz aGVkRm9yUGFnZShjb25zdCBXZWJQYWdlUHJveHkmIHBhZ2UpCiB7CiAgICAgaWYgKGF1dG8gY2Fs bGJhY2sgPSBtX3BlbmRpbmdLZXlib2FyZEV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlLnRh a2UocGFnZS5wYWdlSUQoKSkpIHsKKyAgICAgICAgY2FsbGJhY2stPnNlbmRTdWNjZXNzKEpTT046 Ok9iamVjdDo6Y3JlYXRlKCkpOworCiAgICAgICAgIGlmIChtX3BlbmRpbmdLZXlib2FyZEV2ZW50 c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG1fc2ltdWxh dGluZ1VzZXJJbnRlcmFjdGlvbiA9IGZhbHNlOwotCi0gICAgICAgIGNhbGxiYWNrKHN0ZDo6bnVs bG9wdCk7CiAgICAgfQogfQogCkBAIC0xNDMxLDM0ICsxMzk4LDEyIEBAIHZvaWQgV2ViQXV0b21h dGlvblNlc3Npb246OnBlcmZvcm1Nb3VzZUludGVyYWN0aW9uKGNvbnN0IFN0cmluZyYgaGFuZGxl LCBjb25zdCBKCiAgICAgICAgIGlmICghcGFyc2VkQnV0dG9uKQogICAgICAgICAgICAgQVNZTkNf RkFJTF9XSVRIX1BSRURFRklORURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwg IlRoZSBwYXJhbWV0ZXIgJ2J1dHRvbicgaXMgaW52YWxpZC4iKTsKIAotICAgICAgICBhdXRvIG1v dXNlRXZlbnRzRmx1c2hlZENhbGxiYWNrID0gW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3Rl Y3RlZFRoaXMpLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBwYWdlID0gcGFnZS5jb3B5 UmVmKCksIHgsIHldKHN0ZDo6b3B0aW9uYWw8QXV0b21hdGlvbkNvbW1hbmRFcnJvcj4gZXJyb3Ip IHsKLSAgICAgICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAgICAgICBjYWxsYmFjay0+c2Vu ZEZhaWx1cmUoZXJyb3IudmFsdWUoKS50b1Byb3RvY29sU3RyaW5nKCkpOwotICAgICAgICAgICAg ZWxzZSB7Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2stPnNlbmRTdWNjZXNzKEluc3BlY3Rvcjo6 UHJvdG9jb2w6OkF1dG9tYXRpb246OlBvaW50OjpjcmVhdGUoKQotICAgICAgICAgICAgICAgICAg ICAuc2V0WCh4KQotICAgICAgICAgICAgICAgICAgICAuc2V0WSh5IC0gcGFnZS0+dG9wQ29udGVu dEluc2V0KCkpCi0gICAgICAgICAgICAgICAgICAgIC5yZWxlYXNlKCkpOwotICAgICAgICAgICAg fQotICAgICAgICB9OwotCi0gICAgICAgIGF1dG8mIGNhbGxiYWNrSW5NYXAgPSBtX3BlbmRpbmdN b3VzZUV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlLmFkZChwYWdlLT5wYWdlSUQoKSwgbnVs bHB0cikuaXRlcmF0b3ItPnZhbHVlOwotICAgICAgICBpZiAoY2FsbGJhY2tJbk1hcCkKLSAgICAg ICAgICAgIGNhbGxiYWNrSW5NYXAoQVVUT01BVElPTl9DT01NQU5EX0VSUk9SX1dJVEhfTkFNRShU aW1lb3V0KSk7Ci0gICAgICAgIGNhbGxiYWNrSW5NYXAgPSBXVEZNb3ZlKG1vdXNlRXZlbnRzRmx1 c2hlZENhbGxiYWNrKTsKLQotICAgICAgICAvLyBUaGlzIGlzIGNsZWFyZWQgd2hlbiBhbGwgbW91 c2UgZXZlbnRzIGFyZSBmbHVzaGVkLgotICAgICAgICBtX3NpbXVsYXRpbmdVc2VySW50ZXJhY3Rp b24gPSB0cnVlOwotCiAgICAgICAgIHBsYXRmb3JtU2ltdWxhdGVNb3VzZUludGVyYWN0aW9uKHBh Z2UsIHZpZXdQb3NpdGlvbiwgcGFyc2VkSW50ZXJhY3Rpb24udmFsdWUoKSwgcGFyc2VkQnV0dG9u LnZhbHVlKCksIGtleU1vZGlmaWVycyk7Ci0gICAgICAgIAotICAgICAgICAvLyBJZiB0aGUgZXZl bnQgbG9jYXRpb24gd2FzIHByZXZpb3VzbHkgY2xpcHBlZCBhbmQgZG9lcyBub3QgaGl0IHRlc3Qg YW55dGhpbmcgaW4gdGhlIHdpbmRvdywgdGhlbiBpdCB3aWxsIG5vdCBiZSBwcm9jZXNzZWQuCi0g ICAgICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdpdGggcHJlLVczQyBkcml2ZXIgaW1wbGVtZW50 YXRpb25zLCBkb24ndCBtYWtlIHRoaXMgYSBoYXJkIGVycm9yOyBqdXN0IGRvIG5vdGhpbmcgc2ls ZW50bHkuCi0gICAgICAgIC8vIEluIFczQy1vbmx5IGNvZGUgcGF0aHMsIHdlIGNhbiByZWplY3Qg YW55IHBvaW50ZXIgYWN0aW9ucyB3aG9zZSBjb29yZGluYXRlcyBhcmUgb3V0c2lkZSB0aGUgdmll d3BvcnQgcmVjdC4KLSAgICAgICAgaWYgKGNhbGxiYWNrSW5NYXAgJiYgIXBhZ2UtPmlzUHJvY2Vz c2luZ01vdXNlRXZlbnRzKCkpIHsKLSAgICAgICAgICAgIGF1dG8gY2FsbGJhY2tUb0NhbmNlbCA9 IG1fcGVuZGluZ01vdXNlRXZlbnRzRmx1c2hlZENhbGxiYWNrc1BlclBhZ2UudGFrZShwYWdlLT5w YWdlSUQoKSk7Ci0gICAgICAgICAgICBjYWxsYmFja1RvQ2FuY2VsKHN0ZDo6bnVsbG9wdCk7Ci0g ICAgICAgIH0KKworICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoSW5zcGVjdG9yOjpQcm90 b2NvbDo6QXV0b21hdGlvbjo6UG9pbnQ6OmNyZWF0ZSgpCisgICAgICAgICAgICAuc2V0WCh4KQor ICAgICAgICAgICAgLnNldFkoeSAtIHBhZ2UtPnRvcENvbnRlbnRJbnNldCgpKQorICAgICAgICAg ICAgLnJlbGVhc2UoKSk7CiAgICAgfSk7CiAjZW5kaWYgLy8gVVNFKEFQUEtJVCkgfHwgUExBVEZP Uk0oR1RLKQogfQpAQCAtMTUyOCwxNyArMTQ3MywxMCBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNz aW9uOjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFjdGlvbnMoY29uc3QgU3RyaW5nJiBoYW5kbGUsIGNv bgogICAgIGlmICghYWN0aW9uc1RvUGVyZm9ybS5zaXplKCkpCiAgICAgICAgIEFTWU5DX0ZBSUxf V0lUSF9QUkVERUZJTkVEX0VSUk9SX0FORF9ERVRBSUxTKEludGVybmFsRXJyb3IsICJObyBhY3Rp b25zIHRvIHBlcmZvcm0uIik7CiAKLSAgICBhdXRvIGtleWJvYXJkRXZlbnRzRmx1c2hlZENhbGxi YWNrID0gW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY2FsbGJhY2sgPSBXVEZNb3Zl KGNhbGxiYWNrKSwgcGFnZSA9IG1ha2VSZWYoKnBhZ2UpXShzdGQ6Om9wdGlvbmFsPEF1dG9tYXRp b25Db21tYW5kRXJyb3I+IGVycm9yKSB7Ci0gICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAg IGNhbGxiYWNrLT5zZW5kRmFpbHVyZShlcnJvci52YWx1ZSgpLnRvUHJvdG9jb2xTdHJpbmcoKSk7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNhbGxiYWNrLT5zZW5kU3VjY2VzcygpOwotICAg IH07Ci0KICAgICBhdXRvJiBjYWxsYmFja0luTWFwID0gbV9wZW5kaW5nS2V5Ym9hcmRFdmVudHNG bHVzaGVkQ2FsbGJhY2tzUGVyUGFnZS5hZGQocGFnZS0+cGFnZUlEKCksIG51bGxwdHIpLml0ZXJh dG9yLT52YWx1ZTsKICAgICBpZiAoY2FsbGJhY2tJbk1hcCkKLSAgICAgICAgY2FsbGJhY2tJbk1h cChBVVRPTUFUSU9OX0NPTU1BTkRfRVJST1JfV0lUSF9OQU1FKFRpbWVvdXQpKTsKLSAgICBjYWxs YmFja0luTWFwID0gV1RGTW92ZShrZXlib2FyZEV2ZW50c0ZsdXNoZWRDYWxsYmFjayk7CisgICAg ICAgIGNhbGxiYWNrSW5NYXAtPnNlbmRGYWlsdXJlKFNUUklOR19GT1JfUFJFREVGSU5FRF9FUlJP Ul9OQU1FKFRpbWVvdXQpKTsKKyAgICBjYWxsYmFja0luTWFwID0gV1RGTW92ZShjYWxsYmFjayk7 CiAKICAgICAvLyBUaGlzIGlzIGNsZWFyZWQgd2hlbiBhbGwga2V5Ym9hcmQgZXZlbnRzIGFyZSBm bHVzaGVkLgogICAgIG1fc2ltdWxhdGluZ1VzZXJJbnRlcmFjdGlvbiA9IHRydWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNz aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25T ZXNzaW9uLmgKaW5kZXggMjRlODFlNzA1Nzc5OTIyNmEwYjRhZmIyYWZlZDQ3NTA2OWQ2MTIwYS4u NTcwNjc4Mjk5ZGY1YjM0ZjhlNTQwMWYyOTM5Y2E0YjEwNWY2ZTdjZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Np b24uaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYsIDIwMTcg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCkBAIC03NiwyMSArNzYsNiBAQCBjbGFzcyBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5l clByb3h5OwogY2xhc3MgV2ViUGFnZVByb3h5OwogY2xhc3MgV2ViUHJvY2Vzc1Bvb2w7CiAKLXN0 cnVjdCBBdXRvbWF0aW9uQ29tbWFuZEVycm9yIHsKLXB1YmxpYzoKLSAgICBBdXRvbWF0aW9uQ29t bWFuZEVycm9yKEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2FnZSB0 eXBlKQotICAgICAgICA6IHR5cGUodHlwZSkgeyB9Ci0KLSAgICBBdXRvbWF0aW9uQ29tbWFuZEVy cm9yKEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2FnZSB0eXBlLCBj b25zdCBTdHJpbmcmIG1lc3NhZ2UpCi0gICAgICAgIDogdHlwZSh0eXBlKQotICAgICAgICAsIG1l c3NhZ2UobWVzc2FnZSkgeyB9Ci0gICAgCi0gICAgU3RyaW5nIHRvUHJvdG9jb2xTdHJpbmcoKSBj b25zdDsKLQotICAgIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2Fn ZSB0eXBlOwotICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBtZXNzYWdlOwotfTsKLQogY2xhc3Mg V2ViQXV0b21hdGlvblNlc3Npb24gZmluYWwgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6 T2JqZWN0OjpUeXBlOjpBdXRvbWF0aW9uU2Vzc2lvbj4sIHB1YmxpYyBJUEM6Ok1lc3NhZ2VSZWNl aXZlcgogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogICAgICwgcHVibGljIEluc3BlY3Rv cjo6UmVtb3RlQXV0b21hdGlvblRhcmdldApAQCAtMTEzLDcgKzk4LDYgQEAgcHVibGljOgogICAg IHZvaWQgZG9jdW1lbnRMb2FkZWRGb3JGcmFtZShjb25zdCBXZWJGcmFtZVByb3h5Jik7CiAgICAg dm9pZCBpbnNwZWN0b3JGcm9udGVuZExvYWRlZChjb25zdCBXZWJQYWdlUHJveHkmKTsKICAgICB2 b2lkIGtleWJvYXJkRXZlbnRzRmx1c2hlZEZvclBhZ2UoY29uc3QgV2ViUGFnZVByb3h5Jik7Ci0g ICAgdm9pZCBtb3VzZUV2ZW50c0ZsdXNoZWRGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYpOwog ICAgIHZvaWQgd2lsbENsb3NlUGFnZShjb25zdCBXZWJQYWdlUHJveHkmKTsKICAgICB2b2lkIGhh bmRsZVJ1bk9wZW5QYW5lbChjb25zdCBXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJGcmFtZVByb3h5 JiwgY29uc3QgQVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzJiwgV2ViT3BlblBhbmVsUmVzdWx0TGlz dGVuZXJQcm94eSYpOwogICAgIHZvaWQgd2lsbFNob3dKYXZhU2NyaXB0RGlhbG9nKFdlYlBhZ2VQ cm94eSYpOwpAQCAtMjUxLDggKzIzNSw3IEBAIHByaXZhdGU6CiAgICAgSGFzaE1hcDx1aW50NjRf dCwgUmVmUHRyPEluc3BlY3Rvcjo6QmFja2VuZERpc3BhdGNoZXI6OkNhbGxiYWNrQmFzZT4+IG1f cGVuZGluZ05vcm1hbE5hdmlnYXRpb25JbkJyb3dzaW5nQ29udGV4dENhbGxiYWNrc1BlckZyYW1l OwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxJbnNwZWN0b3I6OkJhY2tlbmREaXNwYXRj aGVyOjpDYWxsYmFja0Jhc2U+PiBtX3BlbmRpbmdFYWdlck5hdmlnYXRpb25JbkJyb3dzaW5nQ29u dGV4dENhbGxiYWNrc1BlckZyYW1lOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxJbnNw ZWN0b3I6OkJhY2tlbmREaXNwYXRjaGVyOjpDYWxsYmFja0Jhc2U+PiBtX3BlbmRpbmdJbnNwZWN0 b3JDYWxsYmFja3NQZXJQYWdlOwotICAgIEhhc2hNYXA8dWludDY0X3QsIEZ1bmN0aW9uPHZvaWQo c3RkOjpvcHRpb25hbDxBdXRvbWF0aW9uQ29tbWFuZEVycm9yPik+PiBtX3BlbmRpbmdLZXlib2Fy ZEV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlOwotICAgIEhhc2hNYXA8dWludDY0X3QsIEZ1 bmN0aW9uPHZvaWQoc3RkOjpvcHRpb25hbDxBdXRvbWF0aW9uQ29tbWFuZEVycm9yPik+PiBtX3Bl bmRpbmdNb3VzZUV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlOworICAgIEhhc2hNYXA8dWlu dDY0X3QsIFJlZlB0cjxJbnNwZWN0b3I6OkJhY2tlbmREaXNwYXRjaGVyOjpDYWxsYmFja0Jhc2U+ PiBtX3BlbmRpbmdLZXlib2FyZEV2ZW50c0ZsdXNoZWRDYWxsYmFja3NQZXJQYWdlOwogCiAgICAg dWludDY0X3QgbV9uZXh0RXZhbHVhdGVKYXZhU2NyaXB0Q2FsbGJhY2tJRCB7IDEgfTsKICAgICBI YXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8SW5zcGVjdG9yOjpBdXRvbWF0aW9uQmFja2VuZERpc3Bh dGNoZXJIYW5kbGVyOjpFdmFsdWF0ZUphdmFTY3JpcHRGdW5jdGlvbkNhbGxiYWNrPj4gbV9ldmFs dWF0ZUphdmFTY3JpcHRGdW5jdGlvbkNhbGxiYWNrczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25NYWNyb3MuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25NYWNy b3MuaAppbmRleCAxN2U5YTM3Yzg0Mzk4NTQ0ODk2MWEzNTQzMDRiOTlmYWIyOWEyMzRmLi4yYzVk YjE5N2JhNTYzZTA3MzFkOWM3YzlmNWE2MzYxMjUwZDY4NzA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uTWFjcm9zLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvbk1hY3Jvcy5oCkBAIC0zOCw4ICszOCw2IEBACiAjZGVmaW5lIFNUUklOR19GT1JfUFJFREVG SU5FRF9FUlJPUl9NRVNTQUdFKGVycm9yTWVzc2FnZSkgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0 b21hdGlvbkhlbHBlcnM6OmdldEVudW1Db25zdGFudFZhbHVlKFZBTElEQVRFRF9FUlJPUl9NRVNT QUdFKGVycm9yTWVzc2FnZSkpCiAjZGVmaW5lIFNUUklOR19GT1JfUFJFREVGSU5FRF9FUlJPUl9N RVNTQUdFX0FORF9ERVRBSUxTKGVycm9yTWVzc2FnZSwgZGV0YWlsc1N0cmluZykgbWFrZVN0cmlu ZyhJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uSGVscGVyczo6Z2V0RW51bUNvbnN0YW50 VmFsdWUoVkFMSURBVEVEX0VSUk9SX01FU1NBR0UoZXJyb3JNZXNzYWdlKSksIGVycm9yTmFtZUFu ZERldGFpbHNTZXBhcmF0b3IsIGRldGFpbHNTdHJpbmcpCiAKLSNkZWZpbmUgQVVUT01BVElPTl9D T01NQU5EX0VSUk9SX1dJVEhfTkFNRShlcnJvck5hbWUpIEF1dG9tYXRpb25Db21tYW5kRXJyb3Io SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6RXJyb3JNZXNzYWdlOjplcnJvck5hbWUp Ci0KIC8vIENvbnZlbmllbmNlIG1hY3JvcyBmb3IgZmlsbGluZyBpbiB0aGUgZXJyb3Igc3RyaW5n IG9mIHN5bmNocm9ub3VzIGNvbW1hbmRzIGluIGJhaWxvdXQgYnJhbmNoZXMuCiAjZGVmaW5lIFNZ TkNfRkFJTF9XSVRIX1BSRURFRklORURfRVJST1IoZXJyb3JOYW1lKSBcCiBkbyB7IFwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDRkZjRjZDY5OGNjOWI2ZDcy NjEzMzg1MGY5NTkxMjY1MDUwMWJlMDIuLmEwMWVkODE5ZDQxM2FmZGIwMWQxMzI0ZjJmYzZhNzQ2 NDVkZWY0ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAt MjkzLDMyICsyOTMsMjEgQEAgRXhjZWVkZWREYXRhYmFzZVF1b3RhUmVjb3Jkczo6UmVjb3JkKiBF eGNlZWRlZERhdGFiYXNlUXVvdGFSZWNvcmRzOjpuZXh0KCkKIH0KIAogI2lmICFMT0dfRElTQUJM RUQKLXN0YXRpYyBjb25zdCBjaGFyKiB3ZWJNb3VzZUV2ZW50VHlwZVN0cmluZyhXZWJFdmVudDo6 VHlwZSB0eXBlKQotewotICAgIHN3aXRjaCAodHlwZSkgewotICAgIGNhc2UgV2ViRXZlbnQ6Ok1v dXNlRG93bjoKLSAgICAgICAgcmV0dXJuICJNb3VzZURvd24iOwotICAgIGNhc2UgV2ViRXZlbnQ6 Ok1vdXNlVXA6Ci0gICAgICAgIHJldHVybiAiTW91c2VVcCI7Ci0gICAgY2FzZSBXZWJFdmVudDo6 TW91c2VNb3ZlOgotICAgICAgICByZXR1cm4gIk1vdXNlTW92ZSI7Ci0gICAgZGVmYXVsdDoKLSAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybiAiPHVua25vd24+IjsK LSAgICB9Ci19Ci0KIHN0YXRpYyBjb25zdCBjaGFyKiB3ZWJLZXlib2FyZEV2ZW50VHlwZVN0cmlu ZyhXZWJFdmVudDo6VHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2Ug V2ViRXZlbnQ6OktleURvd246CiAgICAgICAgIHJldHVybiAiS2V5RG93biI7CisgICAgCiAgICAg Y2FzZSBXZWJFdmVudDo6S2V5VXA6CiAgICAgICAgIHJldHVybiAiS2V5VXAiOworICAgIAogICAg IGNhc2UgV2ViRXZlbnQ6OlJhd0tleURvd246CiAgICAgICAgIHJldHVybiAiUmF3S2V5RG93biI7 CisgICAgCiAgICAgY2FzZSBXZWJFdmVudDo6Q2hhcjoKICAgICAgICAgcmV0dXJuICJDaGFyIjsK KyAgICAKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAg ICAgcmV0dXJuICI8dW5rbm93bj4iOwpAQCAtMTkxMSwyOCArMTkwMCwyOCBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6aGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2ZW50JiBldmVu dCkKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9tb3VzZUV2 ZW50UXVldWUuYXBwZW5kKGV2ZW50KTsKLSAgICBpZiAobV9tb3VzZUV2ZW50UXVldWUuc2l6ZSgp ID09IDEpIC8vIE90aGVyd2lzZSwgY2FsbGVkIGZyb20gRGlkUmVjZWl2ZUV2ZW50IG1lc3NhZ2Ug aGFuZGxlci4KLSAgICAgICAgcHJvY2Vzc05leHRRdWV1ZWRNb3VzZUV2ZW50KCk7Ci19Ci0gICAg Ci12b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc05leHRRdWV1ZWRNb3VzZUV2ZW50KCkKLXsKLSAg ICBpZiAoIWlzVmFsaWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgQVNTRVJUKCFtX21vdXNl RXZlbnRRdWV1ZS5pc0VtcHR5KCkpOwotCi0gICAgY29uc3QgTmF0aXZlV2ViTW91c2VFdmVudCYg ZXZlbnQgPSBtX21vdXNlRXZlbnRRdWV1ZS5maXJzdCgpOwotICAgIAogICAgIGlmIChtX3BhZ2VD bGllbnQud2luZG93SXNGcm9udFdpbmRvd1VuZGVyTW91c2UoZXZlbnQpKQogICAgICAgICBzZXRU b29sVGlwKFN0cmluZygpKTsKIAogICAgIC8vIE5PVEU6IFRoaXMgZG9lcyBub3Qgc3RhcnQgdGhl IHJlc3BvbnNpdmVuZXNzIHRpbWVyIGJlY2F1c2UgbW91c2UgbW92ZSBzaG91bGQgbm90IGluZGlj YXRlIGludGVyYWN0aW9uLgogICAgIGlmIChldmVudC50eXBlKCkgIT0gV2ViRXZlbnQ6Ok1vdXNl TW92ZSkKICAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsK KyAgICBlbHNlIHsKKyAgICAgICAgaWYgKG1fcHJvY2Vzc2luZ01vdXNlTW92ZUV2ZW50KSB7Cisg ICAgICAgICAgICBtX25leHRNb3VzZU1vdmVFdmVudCA9IHN0ZDo6bWFrZV91bmlxdWU8TmF0aXZl V2ViTW91c2VFdmVudD4oZXZlbnQpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisK KyAgICAgICAgbV9wcm9jZXNzaW5nTW91c2VNb3ZlRXZlbnQgPSB0cnVlOworICAgIH0KKworICAg IC8vIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc5MDQ+IFdlIG5l ZWQgdG8ga2VlcCB0cmFjayBvZiB0aGUgbW91c2UgZG93biBldmVudCBpbiB0aGUgY2FzZSB3aGVy ZSB3ZQorICAgIC8vIGRpc3BsYXkgYSBwb3B1cCBtZW51IGZvciBzZWxlY3QgZWxlbWVudHMuIFdo ZW4gdGhlIHVzZXIgY2hhbmdlcyB0aGUgc2VsZWN0ZWQgaXRlbSwKKyAgICAvLyB3ZSBmYWtlIGEg bW91c2UgdXAgZXZlbnQgYnkgdXNpbmcgdGhpcyBzdG9yZWQgZG93biBldmVudC4gVGhpcyBldmVu dCBnZXRzIGNsZWFyZWQKKyAgICAvLyB3aGVuIHRoZSBtb3VzZSB1cCBtZXNzYWdlIGlzIHJlY2Vp dmVkIGZyb20gV2ViUHJvY2Vzcy4KKyAgICBpZiAoZXZlbnQudHlwZSgpID09IFdlYkV2ZW50OjpN b3VzZURvd24pCisgICAgICAgIG1fY3VycmVudGx5UHJvY2Vzc2VkTW91c2VEb3duRXZlbnQgPSBz dGQ6Om1ha2VfdW5pcXVlPE5hdGl2ZVdlYk1vdXNlRXZlbnQ+KGV2ZW50KTsKIAotICAgIExPRyhN b3VzZUhhbmRsaW5nLCAiIFVJIHByb2Nlc3M6IHNlbnQgbW91c2VFdmVudCBmcm9tIGhhbmRsZU1v dXNlRXZlbnQiKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Ok1vdXNl RXZlbnQoZXZlbnQpLCBtX3BhZ2VJRCk7CiB9CiAKQEAgLTQ4MzksMjYgKzQ4MjgsOSBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6c2V0VGV4dEZyb21JdGVtRm9yUG9wdXBNZW51KFdlYlBvcHVwTWVudVBy b3h5KiwgaW50MzJfdCBpbmRleAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0VGV4dEZvckFjdGl2ZVBvcHVwTWVudShpbmRleCksIG1fcGFnZUlEKTsKIH0KIAotYm9v bCBXZWJQYWdlUHJveHk6OmlzUHJvY2Vzc2luZ01vdXNlRXZlbnRzKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gIW1fbW91c2VFdmVudFF1ZXVlLmlzRW1wdHkoKTsKLX0KLQogTmF0aXZlV2ViTW91c2VF dmVudCogV2ViUGFnZVByb3h5OjpjdXJyZW50bHlQcm9jZXNzZWRNb3VzZURvd25FdmVudCgpCiB7 Ci0gICAgLy8gPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzkwND4g V2UgbmVlZCB0byBrZWVwIHRyYWNrIG9mIHRoZSBtb3VzZSBkb3duIGV2ZW50IGluIHRoZSBjYXNl IHdoZXJlIHdlCi0gICAgLy8gZGlzcGxheSBhIHBvcHVwIG1lbnUgZm9yIHNlbGVjdCBlbGVtZW50 cy4gV2hlbiB0aGUgdXNlciBjaGFuZ2VzIHRoZSBzZWxlY3RlZCBpdGVtLCB3ZSBmYWtlIGEgbW91 c2V1cCBldmVudCBieQotICAgIC8vIHVzaW5nIHRoaXMgc3RvcmVkIG1vdXNlZG93biBldmVudCBh bmQgY2hhbmdpbmcgdGhlIGV2ZW50IHR5cGUuIFRoaXMgdHJpY2tlcnkgaGFwcGVucyB3aGVuIFdl YlByb2Nlc3MgaGFuZGxlcwotICAgIC8vIGEgbW91c2Vkb3duIGV2ZW50IHRoYXQgcnVucyB0aGUg ZGVmYXVsdCBoYW5kbGVyIGZvciBIVE1MU2VsZWN0RWxlbWVudCwgc28gdGhlIHRyaWdnZXJpbmcg bW91c2Vkb3duIG11c3QgYmUgdGhlIGZpcnN0IGV2ZW50LgotCi0gICAgaWYgKG1fbW91c2VFdmVu dFF1ZXVlLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgCi0gICAgYXV0 byYgZXZlbnQgPSBtX21vdXNlRXZlbnRRdWV1ZS5maXJzdCgpOwotICAgIGlmIChldmVudC50eXBl KCkgIT0gV2ViRXZlbnQ6OlR5cGU6Ok1vdXNlRG93bikKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0KLSAgICByZXR1cm4gJmV2ZW50OworICAgIHJldHVybiBtX2N1cnJlbnRseVByb2Nlc3NlZE1v dXNlRG93bkV2ZW50LmdldCgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6cG9zdE1lc3NhZ2VU b0luamVjdGVkQnVuZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2JqZWN0KiBt ZXNzYWdlQm9keSkKQEAgLTUyNjcsMjQgKzUyMzksMTUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgY2Fz ZSBXZWJFdmVudDo6Tm9UeXBlOgogICAgICAgICBicmVhazsKICAgICBjYXNlIFdlYkV2ZW50OjpN b3VzZU1vdmU6CisgICAgICAgIG1fcHJvY2Vzc2luZ01vdXNlTW92ZUV2ZW50ID0gZmFsc2U7Cisg ICAgICAgIGlmIChtX25leHRNb3VzZU1vdmVFdmVudCkKKyAgICAgICAgICAgIGhhbmRsZU1vdXNl RXZlbnQoKnN0ZDo6ZXhjaGFuZ2UobV9uZXh0TW91c2VNb3ZlRXZlbnQsIG51bGxwdHIpKTsKKyAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJFdmVudDo6TW91c2VEb3duOgotICAgIGNhc2UgV2Vi RXZlbnQ6Ok1vdXNlVXA6IHsKLSAgICAgICAgTE9HKE1vdXNlSGFuZGxpbmcsICJXZWJQYWdlUHJv eHk6OmRpZFJlY2VpdmVFdmVudDogJXMgKHF1ZXVlIGVtcHR5ICVkKSIsIHdlYk1vdXNlRXZlbnRU eXBlU3RyaW5nKHR5cGUpLCBtX21vdXNlRXZlbnRRdWV1ZS5pc0VtcHR5KCkpOwotCi0gICAgICAg IC8vIFJldGlyZSB0aGUgbGFzdCBzZW50IGV2ZW50IG5vdyB0aGF0IFdlYlByb2Nlc3MgaXMgZG9u ZSBoYW5kbGluZyBpdC4KLSAgICAgICAgTUVTU0FHRV9DSEVDSyghbV9tb3VzZUV2ZW50UXVldWUu aXNFbXB0eSgpKTsKLSAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCBldmVudCA9IG1fbW91c2VF dmVudFF1ZXVlLnRha2VGaXJzdCgpOwotICAgICAgICBNRVNTQUdFX0NIRUNLKHR5cGUgPT0gZXZl bnQudHlwZSgpKTsKLQotICAgICAgICBpZiAoIW1fbW91c2VFdmVudFF1ZXVlLmlzRW1wdHkoKSkg ewotICAgICAgICAgICAgTE9HKE1vdXNlSGFuZGxpbmcsICIgVUkgcHJvY2VzczogaGFuZGxpbmcg YSBxdWV1ZWQgbW91c2UgZXZlbnQgZnJvbSBkaWRSZWNlaXZlRXZlbnQiKTsKLSAgICAgICAgICAg IHByb2Nlc3NOZXh0UXVldWVkTW91c2VFdmVudCgpOwotICAgICAgICB9IGVsc2UgaWYgKGF1dG8q IGF1dG9tYXRpb25TZXNzaW9uID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNl c3Npb24oKSkKLSAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5tb3VzZUV2ZW50c0ZsdXNo ZWRGb3JQYWdlKCp0aGlzKTsKLQogICAgICAgICBicmVhazsKLSAgICB9Ci0KKyAgICBjYXNlIFdl YkV2ZW50OjpNb3VzZVVwOgorICAgICAgICBtX2N1cnJlbnRseVByb2Nlc3NlZE1vdXNlRG93bkV2 ZW50ID0gbnVsbHB0cjsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJFdmVudDo6TW91c2VG b3JjZUNoYW5nZWQ6CiAgICAgY2FzZSBXZWJFdmVudDo6TW91c2VGb3JjZURvd246CiAgICAgY2Fz ZSBXZWJFdmVudDo6TW91c2VGb3JjZVVwOgpAQCAtNTMxNyw4ICs1MjgwLDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRs ZWQpCiAKICAgICAgICAgTUVTU0FHRV9DSEVDSyh0eXBlID09IGV2ZW50LnR5cGUoKSk7CiAKLSAg ICAgICAgYm9vbCBjYW5Qcm9jZXNzTW9yZUtleUV2ZW50cyA9ICFtX2tleUV2ZW50UXVldWUuaXNF bXB0eSgpOwotICAgICAgICBpZiAoY2FuUHJvY2Vzc01vcmVLZXlFdmVudHMpIHsKKyAgICAgICAg aWYgKCFtX2tleUV2ZW50UXVldWUuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBMT0coS2V5SGFu ZGxpbmcsICIgVUkgcHJvY2Vzczogc2VudCBrZXlFdmVudCBmcm9tIGRpZFJlY2VpdmVFdmVudCIp OwogICAgICAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpLZXlFdmVu dChtX2tleUV2ZW50UXVldWUuZmlyc3QoKSksIG1fcGFnZUlEKTsKICAgICAgICAgfQpAQCAtNTMz Miw3ICs1Mjk0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJf dCBvcGFxdWVUeXBlLCBib29sIGhhbmRsZWQpCiAgICAgICAgICAgICBtX3VpQ2xpZW50LT5kaWRO b3RIYW5kbGVLZXlFdmVudCh0aGlzLCBldmVudCk7CiAKICAgICAgICAgLy8gTm90aWZ5IHRoZSBz ZXNzaW9uIGFmdGVyIC1bTlNBcHAgc2VuZEV2ZW50Ol0gaGFzIGEgY3JhY2sgYXQgdHVybmluZyB0 aGUgZXZlbnQgaW50byBhbiBhY3Rpb24uCi0gICAgICAgIGlmICghY2FuUHJvY2Vzc01vcmVLZXlF dmVudHMpIHsKKyAgICAgICAgaWYgKG1fa2V5RXZlbnRRdWV1ZS5pc0VtcHR5KCkpIHsKICAgICAg ICAgICAgIGlmIChhdXRvKiBhdXRvbWF0aW9uU2Vzc2lvbiA9IHByb2Nlc3MoKS5wcm9jZXNzUG9v bCgpLmF1dG9tYXRpb25TZXNzaW9uKCkpCiAgICAgICAgICAgICAgICAgYXV0b21hdGlvblNlc3Np b24tPmtleWJvYXJkRXZlbnRzRmx1c2hlZEZvclBhZ2UoKnRoaXMpOwogICAgICAgICB9CkBAIC01 OTM2LDEwICs1ODk4LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlQWZ0ZXJQcm9j ZXNzRXhpdGVkKFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiB0ZXJtaW5hCiAgICAgbV9wZW5kaW5n TGVhcm5Pcklnbm9yZVdvcmRNZXNzYWdlQ291bnQgPSAwOwogCiAgICAgLy8gQ2FuJ3QgZXhwZWN0 IERpZFJlY2VpdmVFdmVudCBub3RpZmljYXRpb25zIGZyb20gYSBjcmFzaGVkIHdlYiBwcm9jZXNz LgotICAgIG1fbW91c2VFdmVudFF1ZXVlLmNsZWFyKCk7CiAgICAgbV9rZXlFdmVudFF1ZXVlLmNs ZWFyKCk7CiAgICAgbV93aGVlbEV2ZW50UXVldWUuY2xlYXIoKTsKICAgICBtX2N1cnJlbnRseVBy b2Nlc3NlZFdoZWVsRXZlbnRzLmNsZWFyKCk7CisKKyAgICBtX25leHRNb3VzZU1vdmVFdmVudCA9 IG51bGxwdHI7CisgICAgbV9jdXJyZW50bHlQcm9jZXNzZWRNb3VzZURvd25FdmVudCA9IG51bGxw dHI7CisKKyAgICBtX3Byb2Nlc3NpbmdNb3VzZU1vdmVFdmVudCA9IGZhbHNlOworCiAjaWYgRU5B QkxFKFRPVUNIX0VWRU5UUykgJiYgIUVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQogICAgIG1fdG91 Y2hFdmVudFF1ZXVlLmNsZWFyKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKaW5kZXggMjMzZjEzYWRiY2I3ODM1M2UyM2IzMDdhZjBiODA3ODQ1NjhlNzk1MC4u ODdhMGI1OWNkMTY0Mjg2ZjViY2RhNzAwZWVlZDAxZTFiNWZhMjk3ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTY4NSwxMCArNjg1LDcgQEAgcHVibGljOgogICAg IHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBjb2xvcikgeyBt X2JhY2tncm91bmRDb2xvciA9IGNvbG9yOyB9CiAjZW5kaWYKIAotICAgIGJvb2wgaXNQcm9jZXNz aW5nTW91c2VFdmVudHMoKSBjb25zdDsKLSAgICB2b2lkIHByb2Nlc3NOZXh0UXVldWVkTW91c2VF dmVudCgpOwogICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2 ZW50Jik7Ci0KICAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgTmF0aXZlV2ViV2hlZWxF dmVudCYpOwogICAgIHZvaWQgaGFuZGxlS2V5Ym9hcmRFdmVudChjb25zdCBOYXRpdmVXZWJLZXli b2FyZEV2ZW50Jik7CiAKQEAgLTE5MzgsNyArMTkzNSw2IEBAIHByaXZhdGU6CiAgICAgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0IG1fZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VSZXF1ZXN0OwogICAg IGJvb2wgbV9zaG91bGRTdXBwcmVzc0FwcExpbmtzSW5OZXh0TmF2aWdhdGlvblBvbGljeURlY2lz aW9uIHsgZmFsc2UgfTsKIAotICAgIERlcXVlPE5hdGl2ZVdlYk1vdXNlRXZlbnQ+IG1fbW91c2VF dmVudFF1ZXVlOwogICAgIERlcXVlPE5hdGl2ZVdlYktleWJvYXJkRXZlbnQ+IG1fa2V5RXZlbnRR dWV1ZTsKICAgICBEZXF1ZTxOYXRpdmVXZWJXaGVlbEV2ZW50PiBtX3doZWVsRXZlbnRRdWV1ZTsK ICAgICBEZXF1ZTxzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPE5hdGl2ZVdlYldoZWVsRXZlbnQ+Pj4g bV9jdXJyZW50bHlQcm9jZXNzZWRXaGVlbEV2ZW50czsKQEAgLTE5NDYsNiArMTk0MiwxMCBAQCBw cml2YXRlOgogICAgIERlcXVlPE5hdGl2ZVdlYkdlc3R1cmVFdmVudD4gbV9nZXN0dXJlRXZlbnRR dWV1ZTsKICNlbmRpZgogCisgICAgYm9vbCBtX3Byb2Nlc3NpbmdNb3VzZU1vdmVFdmVudCB7IGZh bHNlIH07CisgICAgc3RkOjp1bmlxdWVfcHRyPE5hdGl2ZVdlYk1vdXNlRXZlbnQ+IG1fbmV4dE1v dXNlTW92ZUV2ZW50OworICAgIHN0ZDo6dW5pcXVlX3B0cjxOYXRpdmVXZWJNb3VzZUV2ZW50PiBt X2N1cnJlbnRseVByb2Nlc3NlZE1vdXNlRG93bkV2ZW50OworCiAjaWYgRU5BQkxFKFRPVUNIX0VW RU5UUykKICAgICBzdHJ1Y3QgVG91Y2hFdmVudFRyYWNraW5nIHsKICAgICAgICAgV2ViQ29yZTo6 VHJhY2tpbmdUeXBlIHRvdWNoRm9yY2VDaGFuZ2VkVHJhY2tpbmcgeyBXZWJDb3JlOjpUcmFja2lu Z1R5cGU6Ok5vdFRyYWNraW5nIH07Cg==