84809 2012-04-24 17:17:07 -0700 REGRESSION(r115099): Made html5lib/runner.html crash, spot fix didn't help so rolling out so original author can do over. (Requested by kling on #webkit). 2012-04-24 17:46:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84413 1 webkit.review.bot webkit.review.bot cmarcelo kling oldest_to_newest 609286 0 webkit.review.bot 2012-04-24 17:17:07 -0700 http://trac.webkit.org/changeset/115099 broke the build: Made html5lib/runner.html crash, spot fix didn't help so rolling out so original author can do over. (Requested by kling on #webkit). This is an automatic bug report generated by the sheriff-bot. 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 case pain. "Only you can prevent forest fires." -- Smokey the Bear 609290 1 138697 webkit.review.bot 2012-04-24 17:18:51 -0700 Created attachment 138697 ROLLOUT of r115099 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. 609315 2 138697 webkit.review.bot 2012-04-24 17:46:30 -0700 Comment on attachment 138697 ROLLOUT of r115099 Clearing flags on attachment: 138697 Committed r115149: <http://trac.webkit.org/changeset/115149> 609316 3 webkit.review.bot 2012-04-24 17:46:35 -0700 All reviewed patches have been landed. Closing bug. 138697 2012-04-24 17:18:51 -0700 2012-04-24 17:46:30 -0700 ROLLOUT of r115099 bug-84809-20120425002223.patch text/plain 20003 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM2NWY4NmVkNTIzNTNk MzIwMjc2NDQ2ZWEzNTQ3MGI3NzIzZjYwMC4uM2IyMDhlMDNmMGNkMGU4NjIxMGViZjEwZmNjODJm YWJkYWExZDJmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDEyLTA0LTI0ICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KKworICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTE1MDk5LCByMTE1MTAyLCBhbmQgcjExNTEyNy4KKyAgICAgICAg aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTE1MDk5CisgICAgICAgIGh0dHA6Ly90 cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzExNTEwMgorICAgICAgICBodHRwOi8vdHJhYy53ZWJr aXQub3JnL2NoYW5nZXNldC8xMTUxMjcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg0ODA5CisKKyAgICAgICAgTWFkZSBodG1sNWxpYi9ydW5uZXIuaHRt bCBjcmFzaCwgc3BvdCBmaXggZGlkbid0IGhlbHAgc28KKyAgICAgICAgcm9sbGluZyBvdXQgc28g b3JpZ2luYWwgYXV0aG9yIGNhbiBkbyBvdmVyLiAoUmVxdWVzdGVkIGJ5CisgICAgICAgIGtsaW5n IG9uICN3ZWJraXQpLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RWxlbWVudDo6cGFyc2VyU2V0QXR0cmlidXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50Ojpub3JtYWxpemVBdHRyaWJ1dGVzKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgor ICAgICAgICAoRWxlbWVudCk6CisgICAgICAgICogZG9tL0VsZW1lbnRBdHRyaWJ1dGVEYXRhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0ZVZlY3Rvcjo6cmVtb3ZlQXR0cmlidXRlKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGRvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5o OgorICAgICAgICAoQXR0cmlidXRlVmVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkF0dHJpYnV0 ZVZlY3Rvcjo6QXR0cmlidXRlVmVjdG9yKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAo V2ViQ29yZTo6QXR0cmlidXRlVmVjdG9yOjpnZXRBdHRyaWJ1dGVJdGVtKToKKyAgICAgICAgKFdl YkNvcmU6OkF0dHJpYnV0ZVZlY3Rvcjo6Z2V0QXR0cmlidXRlSXRlbUluZGV4KToKKyAgICAgICAg KFdlYkNvcmU6OkF0dHJpYnV0ZVZlY3Rvcjo6aW5zZXJ0QXR0cmlidXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkVsZW1lbnRBdHRyaWJ1dGVEYXRhOjpnZXRBdHRyaWJ1dGVJdGVtKToKKyAgICAgICAg KFdlYkNvcmU6OkVsZW1lbnRBdHRyaWJ1dGVEYXRhOjpnZXRBdHRyaWJ1dGVJdGVtSW5kZXgpOgor ICAgICAgICAoV2ViQ29yZTo6RWxlbWVudEF0dHJpYnV0ZURhdGE6OmF0dHJpYnV0ZVZlY3Rvcik6 CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50QXR0cmlidXRlRGF0YTo6Y2xvbmVkQXR0cmlidXRl VmVjdG9yKToKKyAgICAgICAgKEVsZW1lbnRBdHRyaWJ1dGVEYXRhKToKKyAgICAgICAgKiBodG1s L3BhcnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M Q29uc3RydWN0aW9uU2l0ZTo6Y3JlYXRlSFRNTEVsZW1lbnRGcm9tU2F2ZWRFbGVtZW50KToKKyAg ICAgICAgKiBodG1sL3BhcnNlci9IVE1MVG9rZW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OkF0b21p Y0hUTUxUb2tlbjo6QXRvbWljSFRNTFRva2VuKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1M VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9j ZXNzRmFrZVN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6YXR0 cmlidXRlc0ZvcklzaW5kZXhJbnB1dCk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRyZWVC dWlsZGVyLmg6CisgICAgICAgICogaHRtbC9wYXJzZXIvVGV4dERvY3VtZW50UGFyc2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlRleHREb2N1bWVudFBhcnNlcjo6aW5zZXJ0RmFrZVByZUVsZW1l bnQpOgorICAgICAgICAqIHhtbC9YTUxFcnJvcnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlWEhUTUxQYXJzZXJFcnJvckhlYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpYTUxFcnJvcnM6 Omluc2VydEVycm9yTWVzc2FnZUJsb2NrKToKKyAgICAgICAgKiB4bWwvcGFyc2VyL01hcmt1cFRv a2VuQmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6QXRvbWljTWFya3VwVG9rZW5CYXNlOjpBdG9t aWNNYXJrdXBUb2tlbkJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6QXRvbWljTWFya3VwVG9rZW5C YXNlOjpnZXRBdHRyaWJ1dGVJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OkF0b21pY01hcmt1cFRv a2VuQmFzZTo6YXR0cmlidXRlcyk6CisgICAgICAgIChBdG9taWNNYXJrdXBUb2tlbkJhc2UpOgor ICAgICAgICAoV2ViQ29yZTo6Ojppbml0aWFsaXplQXR0cmlidXRlcyk6CisgICAgICAgICogeG1s L3BhcnNlci9YTUxUb2tlbi5oOgorICAgICAgICAoV2ViQ29yZTo6QXRvbWljWE1MVG9rZW46OkF0 b21pY1hNTFRva2VuKToKKwogMjAxMi0wNC0yNCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEltYWdlIG1hc2tzIGFyZSBjb25zaWRlcmVk IG9wYXF1ZSBpbmNvcnJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IGFhNzUyNmE5ZDZm NDA3Y2RjN2IzNjZjNWI5MTM2ZDA1OWNjNjEwMDEuLjc1ZWJmM2Y3OTA3MzVhZDU1NTMwNmE5MjFm Mzc2ODQxZDEzNDViODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTc2MCw3ICs3NjAsNyBA QCBzdGF0aWMgYm9vbCBpc0F0dHJpYnV0ZVRvUmVtb3ZlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5h bWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdgogICAgIHJldHVybiAobmFtZS5sb2NhbE5hbWUoKS5l bmRzV2l0aChocmVmQXR0ci5sb2NhbE5hbWUoKSkgfHwgbmFtZSA9PSBzcmNBdHRyIHx8IG5hbWUg PT0gYWN0aW9uQXR0cikgJiYgcHJvdG9jb2xJc0phdmFTY3JpcHQoc3RyaXBMZWFkaW5nQW5kVHJh aWxpbmdIVE1MU3BhY2VzKHZhbHVlKSk7ICAgICAgIAogfQogCi12b2lkIEVsZW1lbnQ6OnBhcnNl clNldEF0dHJpYnV0ZXMoY29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZVZlY3Rvciwg RnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCit2b2lkIEVs ZW1lbnQ6OnBhcnNlclNldEF0dHJpYnV0ZXMoY29uc3QgQXR0cmlidXRlVmVjdG9yJiBhdHRyaWJ1 dGVWZWN0b3IsIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiBzY3JpcHRpbmdQZXJtaXNzaW9u KQogewogICAgIEFTU0VSVCghaW5Eb2N1bWVudCgpKTsKICAgICBBU1NFUlQoIXBhcmVudE5vZGUo KSk7CkBAIC03OTMsNyArNzkzLDcgQEAgdm9pZCBFbGVtZW50OjpwYXJzZXJTZXRBdHRyaWJ1dGVz KGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1dGVWZWN0b3IsIEZyYWcKIAogICAgIC8v IFN0b3JlIHRoZSBzZXQgb2YgYXR0cmlidXRlcyB0aGF0IGNoYW5nZWQgb24gdGhlIHN0YWNrIGlu IGNhc2UKICAgICAvLyBhdHRyaWJ1dGVDaGFuZ2VkIG11dGF0ZXMgbV9hdHRyaWJ1dGVEYXRhLgot ICAgIFZlY3RvcjxBdHRyaWJ1dGU+IGNsb25lZEF0dHJpYnV0ZXMgPSBtX2F0dHJpYnV0ZURhdGEt PmNsb25lZEF0dHJpYnV0ZVZlY3RvcigpOworICAgIEF0dHJpYnV0ZVZlY3RvciBjbG9uZWRBdHRy aWJ1dGVzID0gbV9hdHRyaWJ1dGVEYXRhLT5jbG9uZWRBdHRyaWJ1dGVWZWN0b3IoKTsKICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2xvbmVkQXR0cmlidXRlcy5zaXplKCk7ICsraSkKICAg ICAgICAgYXR0cmlidXRlQ2hhbmdlZCgmY2xvbmVkQXR0cmlidXRlc1tpXSk7CiB9CkBAIC0xNzM3 LDcgKzE3MzcsNyBAQCB2b2lkIEVsZW1lbnQ6Om5vcm1hbGl6ZUF0dHJpYnV0ZXMoKQogICAgIGlm ICghYXR0cmlidXRlRGF0YSB8fCBhdHRyaWJ1dGVEYXRhLT5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1dGVzID0gYXR0cmli dXRlRGF0YS0+YXR0cmlidXRlVmVjdG9yKCk7CisgICAgY29uc3QgQXR0cmlidXRlVmVjdG9yJiBh dHRyaWJ1dGVzID0gYXR0cmlidXRlRGF0YS0+YXR0cmlidXRlVmVjdG9yKCk7CiAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBhdHRyaWJ1dGVzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGlmIChS ZWZQdHI8QXR0cj4gYXR0ciA9IGF0dHJJZkV4aXN0cyhhdHRyaWJ1dGVzW2ldLm5hbWUoKSkpCiAg ICAgICAgICAgICBhdHRyLT5ub3JtYWxpemUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IGZiM2Zl MzZhZjNiMmI4ODg1ZDE1MWZjZTAwYmM1MWIyMTRiYmY5ZjcuLjFjNDViODJhNjE0M2FkNWJjZjhm YjViNmRmZDlhNTg3ZmE1YTNiZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtMjQ0LDcgKzI0NCw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYXR0cmlidXRlQ2hhbmdlZChBdHRyaWJ1dGUq KTsKIAogICAgIC8vIE9ubHkgY2FsbGVkIGJ5IHRoZSBwYXJzZXIgaW1tZWRpYXRlbHkgYWZ0ZXIg ZWxlbWVudCBjb25zdHJ1Y3Rpb24uCi0gICAgdm9pZCBwYXJzZXJTZXRBdHRyaWJ1dGVzKGNvbnN0 IFZlY3RvcjxBdHRyaWJ1dGU+JiwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uKTsKKyAgICB2 b2lkIHBhcnNlclNldEF0dHJpYnV0ZXMoY29uc3QgQXR0cmlidXRlVmVjdG9yJiwgRnJhZ21lbnRT Y3JpcHRpbmdQZXJtaXNzaW9uKTsKIAogICAgIEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1 dGVEYXRhKCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVEYXRhLmdldCgpOyB9CiAgICAgRWxl bWVudEF0dHJpYnV0ZURhdGEqIGVuc3VyZUF0dHJpYnV0ZURhdGEoKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudEF0dHJpYnV0ZURhdGEuY3BwCmluZGV4IGNiODkxN2E0NTQ4YTY5 NGRmNWU4YTZiMDdmZTAxMjMyNjRiNjM1NmQuLjlmNTE5YWRiNGM0MWY1NDhmMmNhMDYxMmM4NTlk MjFjMjA0NmRjMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmli dXRlRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRBdHRyaWJ1dGVEYXRh LmNwcApAQCAtNzEsNiArNzEsMTUgQEAgdm9pZCBFbGVtZW50QXR0cmlidXRlRGF0YTo6cmVtb3Zl QXR0cihFbGVtZW50KiBlbGVtZW50LCBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW0KICAgICAtLW1f YXR0ckNvdW50OwogfQogCit2b2lkIEF0dHJpYnV0ZVZlY3Rvcjo6cmVtb3ZlQXR0cmlidXRlKGNv bnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpCit7CisgICAgc2l6ZV90IGluZGV4ID0gZ2V0QXR0cmli dXRlSXRlbUluZGV4KG5hbWUpOworICAgIGlmIChpbmRleCA9PSBub3RGb3VuZCkKKyAgICAgICAg cmV0dXJuOworCisgICAgcmVtb3ZlKGluZGV4KTsKK30KKwogRWxlbWVudEF0dHJpYnV0ZURhdGE6 On5FbGVtZW50QXR0cmlidXRlRGF0YSgpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudEF0dHJpYnV0ZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 QXR0cmlidXRlRGF0YS5oCmluZGV4IGE4NDliZmU5Nzg5MDg3MWViOWU3N2RlOGIwY2RjZWQzYTZh ZTg2MzcuLjdlYWUyYjdmY2I4NzY1NWYxOTBjZWUyM2VkNGZjODA4M2I2NzNiMGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50QXR0cmlidXRlRGF0YS5oCkBAIC0zNiwxNSArMzYsNDEgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQXR0cjsKIGNsYXNzIEVsZW1lbnQ7CiAKLWlubGlu ZSBBdHRyaWJ1dGUqIGZpbmRBdHRyaWJ1dGVJblZlY3Rvcihjb25zdCBWZWN0b3I8QXR0cmlidXRl PiYgYXR0cmlidXRlcywgY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkKK2NsYXNzIEF0dHJpYnV0 ZVZlY3RvciA6IHB1YmxpYyBWZWN0b3I8QXR0cmlidXRlPiB7CitwdWJsaWM6CisgICAgQXR0cmli dXRlVmVjdG9yKCkgeyB9CisKKyAgICBBdHRyaWJ1dGUqIGdldEF0dHJpYnV0ZUl0ZW0oY29uc3Qg UXVhbGlmaWVkTmFtZSYpIGNvbnN0OworICAgIHNpemVfdCBnZXRBdHRyaWJ1dGVJdGVtSW5kZXgo Y29uc3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0OworCisgICAgLy8gVXNlZCBkdXJpbmcgcGFyc2lu Zzogb25seSBpbnNlcnRzIGlmIG5vdCBhbHJlYWR5IHRoZXJlLgorICAgIHZvaWQgaW5zZXJ0QXR0 cmlidXRlKGNvbnN0IEF0dHJpYnV0ZSYpOworICAgIHZvaWQgcmVtb3ZlQXR0cmlidXRlKGNvbnN0 IFF1YWxpZmllZE5hbWUmKTsKK307CisKK2lubGluZSBBdHRyaWJ1dGUqIEF0dHJpYnV0ZVZlY3Rv cjo6Z2V0QXR0cmlidXRlSXRlbShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdAogewot ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhdHRyaWJ1dGVzLnNpemUoKTsgKytpKSB7Ci0g ICAgICAgIGlmIChhdHRyaWJ1dGVzLmF0KGkpLm5hbWUoKS5tYXRjaGVzKG5hbWUpKQotICAgICAg ICAgICAgcmV0dXJuICZjb25zdF9jYXN0PFZlY3RvcjxBdHRyaWJ1dGU+JiA+KGF0dHJpYnV0ZXMp LmF0KGkpOwotICAgIH0KKyAgICBzaXplX3QgaW5kZXggPSBnZXRBdHRyaWJ1dGVJdGVtSW5kZXgo bmFtZSk7CisgICAgaWYgKGluZGV4ICE9IG5vdEZvdW5kKQorICAgICAgICByZXR1cm4gJmNvbnN0 X2Nhc3Q8QXR0cmlidXRlVmVjdG9yKj4odGhpcyktPmF0KGluZGV4KTsKICAgICByZXR1cm4gMDsK IH0KIAoraW5saW5lIHNpemVfdCBBdHRyaWJ1dGVWZWN0b3I6OmdldEF0dHJpYnV0ZUl0ZW1JbmRl eChjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdAoreworICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBzaXplKCk7ICsraSkgeworICAgICAgICBpZiAoYXQoaSkubmFtZSgpLm1hdGNo ZXMobmFtZSkpCisgICAgICAgICAgICByZXR1cm4gaTsKKyAgICB9CisgICAgcmV0dXJuIG5vdEZv dW5kOworfQorCitpbmxpbmUgdm9pZCBBdHRyaWJ1dGVWZWN0b3I6Omluc2VydEF0dHJpYnV0ZShj b25zdCBBdHRyaWJ1dGUmIG5ld0F0dHJpYnV0ZSkKK3sKKyAgICBpZiAoIWdldEF0dHJpYnV0ZUl0 ZW0obmV3QXR0cmlidXRlLm5hbWUoKSkpCisgICAgICAgIGFwcGVuZChuZXdBdHRyaWJ1dGUpOwor fQorCiBlbnVtIEVJblVwZGF0ZVN0eWxlQXR0cmlidXRlIHsgTm90SW5VcGRhdGVTdHlsZUF0dHJp YnV0ZSwgSW5VcGRhdGVTdHlsZUF0dHJpYnV0ZSB9OwogCiBjbGFzcyBFbGVtZW50QXR0cmlidXRl RGF0YSB7CkBAIC04MSw4ICsxMDcsOCBAQCBwdWJsaWM6CiAKICAgICAvLyBJbnRlcm5hbCBpbnRl cmZhY2UuCiAgICAgQXR0cmlidXRlKiBhdHRyaWJ1dGVJdGVtKHVuc2lnbmVkIGluZGV4KSBjb25z dCB7IHJldHVybiAmY29uc3RfY2FzdDxFbGVtZW50QXR0cmlidXRlRGF0YSo+KHRoaXMpLT5tX2F0 dHJpYnV0ZXNbaW5kZXhdOyB9Ci0gICAgQXR0cmlidXRlKiBnZXRBdHRyaWJ1dGVJdGVtKGNvbnN0 IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0IHsgcmV0dXJuIGZpbmRBdHRyaWJ1dGVJblZlY3Rv cihtX2F0dHJpYnV0ZXMsIG5hbWUpOyB9Ci0gICAgc2l6ZV90IGdldEF0dHJpYnV0ZUl0ZW1JbmRl eChjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7CisgICAgQXR0cmlidXRlKiBnZXRBdHRyaWJ1 dGVJdGVtKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0IHsgcmV0dXJuIG1fYXR0cmli dXRlcy5nZXRBdHRyaWJ1dGVJdGVtKG5hbWUpOyB9CisgICAgc2l6ZV90IGdldEF0dHJpYnV0ZUl0 ZW1JbmRleChjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lKSBjb25zdCB7IHJldHVybiBtX2F0dHJp YnV0ZXMuZ2V0QXR0cmlidXRlSXRlbUluZGV4KG5hbWUpOyB9CiAgICAgc2l6ZV90IGdldEF0dHJp YnV0ZUl0ZW1JbmRleChjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wgc2hvdWxkSWdub3JlQXR0cmli dXRlQ2FzZSkgY29uc3Q7CiAKICAgICAvLyBUaGVzZSBmdW5jdGlvbnMgZG8gbm8gZXJyb3IgY2hl Y2tpbmcuCkBAIC0xMTAsOCArMTM2LDggQEAgcHJpdmF0ZToKICAgICB7CiAgICAgfQogCi0gICAg Y29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZVZlY3RvcigpIGNvbnN0IHsgcmV0dXJu IG1fYXR0cmlidXRlczsgfQotICAgIFZlY3RvcjxBdHRyaWJ1dGU+IGNsb25lZEF0dHJpYnV0ZVZl Y3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fYXR0cmlidXRlczsgfQorICAgIGNvbnN0IEF0dHJpYnV0 ZVZlY3RvciYgYXR0cmlidXRlVmVjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVzOyB9 CisgICAgQXR0cmlidXRlVmVjdG9yIGNsb25lZEF0dHJpYnV0ZVZlY3RvcigpIGNvbnN0IHsgcmV0 dXJuIG1fYXR0cmlidXRlczsgfQogCiAgICAgdm9pZCBkZXRhY2hBdHRyaWJ1dGVzRnJvbUVsZW1l bnQoRWxlbWVudCopOwogICAgIEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbShjb25zdCBTdHJp bmcmIG5hbWUsIGJvb2wgc2hvdWxkSWdub3JlQXR0cmlidXRlQ2FzZSkgY29uc3Q7CkBAIC0xMjQs NyArMTUwLDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gbV9hdHRy aWJ1dGVTdHlsZTsKICAgICBTcGFjZVNwbGl0U3RyaW5nIG1fY2xhc3NOYW1lczsKICAgICBBdG9t aWNTdHJpbmcgbV9pZEZvclN0eWxlUmVzb2x1dGlvbjsKLSAgICBWZWN0b3I8QXR0cmlidXRlPiBt X2F0dHJpYnV0ZXM7CisgICAgQXR0cmlidXRlVmVjdG9yIG1fYXR0cmlidXRlczsKIAogICAgIHVu c2lnbmVkIG1fYXR0ckNvdW50OwogfTsKQEAgLTE0NywxNSArMTczLDYgQEAgaW5saW5lIEF0dHJp YnV0ZSogRWxlbWVudEF0dHJpYnV0ZURhdGE6OmdldEF0dHJpYnV0ZUl0ZW0oY29uc3QgU3RyaW5n JiBuYW1lLCBib28KICAgICByZXR1cm4gMDsKIH0KIAotaW5saW5lIHNpemVfdCBFbGVtZW50QXR0 cmlidXRlRGF0YTo6Z2V0QXR0cmlidXRlSXRlbUluZGV4KGNvbnN0IFF1YWxpZmllZE5hbWUmIG5h bWUpIGNvbnN0Ci17Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fYXR0cmlidXRlcy5z aXplKCk7ICsraSkgewotICAgICAgICBpZiAobV9hdHRyaWJ1dGVzLmF0KGkpLm5hbWUoKS5tYXRj aGVzKG5hbWUpKQotICAgICAgICAgICAgcmV0dXJuIGk7Ci0gICAgfQotICAgIHJldHVybiBub3RG b3VuZDsKLX0KLQogLy8gV2UgdXNlIGEgYm9vbGVhbiBwYXJhbWV0ZXIgaW5zdGVhZCBvZiBjYWxs aW5nIHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2Ugc28gdGhhdCB0aGUgY2FsbGVyCiAvLyBjYW4g dHVuZSB0aGUgYmVoYXZpb3IgKGhhc0F0dHJpYnV0ZSBpcyBjYXNlIHNlbnNpdGl2ZSB3aGVyZWFz IGdldEF0dHJpYnV0ZSBpcyBub3QpLgogaW5saW5lIHNpemVfdCBFbGVtZW50QXR0cmlidXRlRGF0 YTo6Z2V0QXR0cmlidXRlSXRlbUluZGV4KGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCBzaG91bGRJ Z25vcmVBdHRyaWJ1dGVDYXNlKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwCmluZGV4IDNjYTg3NWExYjIwN2IyNjNhZWEy ODZmMTQwNTkxZDQxMjcwYmI2NWEuLmQyY2YwNzNmNjAxZmY3N2IxZTJiYzg2Yjc5ZDQ2OGYzYWEy YjhjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxDb25zdHJ1 Y3Rpb25TaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MQ29uc3Ry dWN0aW9uU2l0ZS5jcHAKQEAgLTQzMiw3ICs0MzIsNyBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IEhU TUxDb25zdHJ1Y3Rpb25TaXRlOjpjcmVhdGVIVE1MRWxlbWVudEZyb21TYXZlZEVsZW1lbnQoRWxl bQogCiAgICAgQVNTRVJUKGVsZW1lbnQtPmlzSFRNTEVsZW1lbnQoKSk7IC8vIG90aGVyd2lzZSBs b2NhbE5hbWUoKSBtaWdodCBiZSB3cm9uZy4KIAotICAgIFZlY3RvcjxBdHRyaWJ1dGU+IGNsb25l ZEF0dHJpYnV0ZXM7CisgICAgQXR0cmlidXRlVmVjdG9yIGNsb25lZEF0dHJpYnV0ZXM7CiAgICAg aWYgKEVsZW1lbnRBdHRyaWJ1dGVEYXRhKiBhdHRyaWJ1dGVEYXRhID0gZWxlbWVudC0+dXBkYXRl ZEF0dHJpYnV0ZURhdGEoKSkKICAgICAgICAgY2xvbmVkQXR0cmlidXRlcyA9IGF0dHJpYnV0ZURh dGEtPmNsb25lZEF0dHJpYnV0ZVZlY3RvcigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MVG9rZW4uaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxUb2tlbi5oCmluZGV4IDRhY2ZlYzlmODc1Zjc2OTk1YmMwYWVhZmU2N2I3YmNhMjYwMGJlYTMu LjY4NmRkM2FhNDc3ZDIxMTAzMmYwNGY5Zjc1ODRmNWViOTg0ZjVjMzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tlbi5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxUb2tlbi5oCkBAIC04Niw3ICs4Niw3IEBAIGNsYXNzIEF0b21pY0hU TUxUb2tlbiA6IHB1YmxpYyBBdG9taWNNYXJrdXBUb2tlbkJhc2U8SFRNTFRva2VuPiB7CiBwdWJs aWM6CiAgICAgQXRvbWljSFRNTFRva2VuKEhUTUxUb2tlbiYgdG9rZW4pIDogQXRvbWljTWFya3Vw VG9rZW5CYXNlPEhUTUxUb2tlbj4oJnRva2VuKSB7IH0KIAotICAgIEF0b21pY0hUTUxUb2tlbihI VE1MVG9rZW5UeXBlczo6VHlwZSB0eXBlLCBBdG9taWNTdHJpbmcgbmFtZSwgY29uc3QgVmVjdG9y PEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMgPSBWZWN0b3I8QXR0cmlidXRlPigpKQorICAgIEF0b21p Y0hUTUxUb2tlbihIVE1MVG9rZW5UeXBlczo6VHlwZSB0eXBlLCBBdG9taWNTdHJpbmcgbmFtZSwg Y29uc3QgQXR0cmlidXRlVmVjdG9yJiBhdHRyaWJ1dGVzID0gQXR0cmlidXRlVmVjdG9yKCkpCiAg ICAgICAgIDogQXRvbWljTWFya3VwVG9rZW5CYXNlPEhUTUxUb2tlbj4odHlwZSwgbmFtZSwgYXR0 cmlidXRlcykKICAgICB7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hU TUxUcmVlQnVpbGRlci5jcHAKaW5kZXggY2RmZDEwMTgyNzQxMWRkMWE2NDU2Y2Q1ZTlhOWVhOTcz NTQzOTEwZS4uZTY5ODQ2YmEzYTg2Yzk3MTQyMWNiNmRiYmMyOGU5NDZjMGMxZGNmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCkBAIC01MzEs NyArNTMxLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NEb2N0eXBlVG9rZW4oQXRv bWljSFRNTFRva2VuJiB0b2tlbikKICAgICBwYXJzZUVycm9yKHRva2VuKTsKIH0KIAotdm9pZCBI VE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NGYWtlU3RhcnRUYWcoY29uc3QgUXVhbGlmaWVkTmFtZSYg dGFnTmFtZSwgY29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMpCit2b2lkIEhUTUxU cmVlQnVpbGRlcjo6cHJvY2Vzc0Zha2VTdGFydFRhZyhjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdO YW1lLCBjb25zdCBBdHRyaWJ1dGVWZWN0b3ImIGF0dHJpYnV0ZXMpCiB7CiAgICAgLy8gRklYTUU6 IFdlJ2xsIG5lZWQgYSBmYW5jaWVyIGNvbnZlcnNpb24gdGhhbiBqdXN0ICJsb2NhbE5hbWUiIGZv ciBTVkcvTWF0aE1MIHRhZ3MuCiAgICAgQXRvbWljSFRNTFRva2VuIGZha2VUb2tlbihIVE1MVG9r ZW5UeXBlczo6U3RhcnRUYWcsIHRhZ05hbWUubG9jYWxOYW1lKCksIGF0dHJpYnV0ZXMpOwpAQCAt NTYwLDE3ICs1NjAsMTYgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NGYWtlUEVuZFRh Z0lmUEluQnV0dG9uU2NvcGUoKQogICAgIHByb2Nlc3NFbmRUYWcoZW5kUCk7CiB9CiAKLVZlY3Rv cjxBdHRyaWJ1dGU+IEhUTUxUcmVlQnVpbGRlcjo6YXR0cmlidXRlc0ZvcklzaW5kZXhJbnB1dChB dG9taWNIVE1MVG9rZW4mIHRva2VuKQorQXR0cmlidXRlVmVjdG9yIEhUTUxUcmVlQnVpbGRlcjo6 YXR0cmlidXRlc0ZvcklzaW5kZXhJbnB1dChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewotICAg IFZlY3RvcjxBdHRyaWJ1dGU+IGF0dHJpYnV0ZXMgPSB0b2tlbi5hdHRyaWJ1dGVzKCk7Ci0KLSAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYXR0cmlidXRlcy5zaXplKCk7ICsraSkgewotICAg ICAgICBjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lID0gYXR0cmlidXRlcy5hdChpKS5uYW1lKCk7 Ci0gICAgICAgIGlmIChuYW1lLm1hdGNoZXMobmFtZUF0dHIpIHx8IG5hbWUubWF0Y2hlcyhhY3Rp b25BdHRyKSB8fCBuYW1lLm1hdGNoZXMocHJvbXB0QXR0cikpCi0gICAgICAgICAgICBhdHRyaWJ1 dGVzLnJlbW92ZShpKTsKKyAgICBBdHRyaWJ1dGVWZWN0b3IgYXR0cmlidXRlcyA9IHRva2VuLmF0 dHJpYnV0ZXMoKTsKKyAgICBpZiAoIWF0dHJpYnV0ZXMuaXNFbXB0eSgpKSB7CisgICAgICAgIGF0 dHJpYnV0ZXMucmVtb3ZlQXR0cmlidXRlKG5hbWVBdHRyKTsKKyAgICAgICAgYXR0cmlidXRlcy5y ZW1vdmVBdHRyaWJ1dGUoYWN0aW9uQXR0cik7CisgICAgICAgIGF0dHJpYnV0ZXMucmVtb3ZlQXR0 cmlidXRlKHByb21wdEF0dHIpOwogICAgIH0KIAotICAgIGF0dHJpYnV0ZXMuYXBwZW5kKEF0dHJp YnV0ZShuYW1lQXR0ciwgaXNpbmRleFRhZy5sb2NhbE5hbWUoKSkpOworICAgIGF0dHJpYnV0ZXMu aW5zZXJ0QXR0cmlidXRlKEF0dHJpYnV0ZShuYW1lQXR0ciwgaXNpbmRleFRhZy5sb2NhbE5hbWUo KSkpOwogICAgIHJldHVybiBhdHRyaWJ1dGVzOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxUcmVlQnVpbGRlci5oCmluZGV4IDY0YTkzYjM0ZmZiZjFmMDRhYTBiNzM0MjIz N2M3OWQ5YWRkNWJiMjMuLmJjMzZhNzlhMTgxZjA4YzhkYTVlN2E1ZmRlYTljNGU3MDhlMGQwZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5oCkBAIC0x NTEsNyArMTUxLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NDaGFyYWN0ZXJCdWZmZXIo RXh0ZXJuYWxDaGFyYWN0ZXJUb2tlbkJ1ZmZlciYpOwogICAgIGlubGluZSB2b2lkIHByb2Nlc3ND aGFyYWN0ZXJCdWZmZXJGb3JJbkJvZHkoRXh0ZXJuYWxDaGFyYWN0ZXJUb2tlbkJ1ZmZlciYpOwog Ci0gICAgdm9pZCBwcm9jZXNzRmFrZVN0YXJ0VGFnKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25z dCBWZWN0b3I8QXR0cmlidXRlPiYgYXR0cmlidXRlcyA9IFZlY3RvcjxBdHRyaWJ1dGU+KCkpOwor ICAgIHZvaWQgcHJvY2Vzc0Zha2VTdGFydFRhZyhjb25zdCBRdWFsaWZpZWROYW1lJiwgY29uc3Qg QXR0cmlidXRlVmVjdG9yJiBhdHRyaWJ1dGVzID0gQXR0cmlidXRlVmVjdG9yKCkpOwogICAgIHZv aWQgcHJvY2Vzc0Zha2VFbmRUYWcoY29uc3QgUXVhbGlmaWVkTmFtZSYpOwogICAgIHZvaWQgcHJv Y2Vzc0Zha2VDaGFyYWN0ZXJzKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgcHJvY2Vzc0Zha2VQ RW5kVGFnSWZQSW5CdXR0b25TY29wZSgpOwpAQCAtMTcyLDcgKzE3Miw3IEBAIHByaXZhdGU6CiAg ICAgaW5saW5lIGJvb2wgc2hvdWxkUHJvY2Vzc1Rva2VuSW5Gb3JlaWduQ29udGVudChBdG9taWNI VE1MVG9rZW4mKTsKICAgICB2b2lkIHByb2Nlc3NUb2tlbkluRm9yZWlnbkNvbnRlbnQoQXRvbWlj SFRNTFRva2VuJik7CiAKLSAgICBWZWN0b3I8QXR0cmlidXRlPiBhdHRyaWJ1dGVzRm9ySXNpbmRl eElucHV0KEF0b21pY0hUTUxUb2tlbiYpOworICAgIEF0dHJpYnV0ZVZlY3RvciBhdHRyaWJ1dGVz Rm9ySXNpbmRleElucHV0KEF0b21pY0hUTUxUb2tlbiYpOwogCiAgICAgSFRNTEVsZW1lbnRTdGFj azo6RWxlbWVudFJlY29yZCogZnVydGhlc3RCbG9ja0ZvckZvcm1hdHRpbmdFbGVtZW50KEVsZW1l bnQqKTsKICAgICB2b2lkIGNhbGxUaGVBZG9wdGlvbkFnZW5jeShBdG9taWNIVE1MVG9rZW4mKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1RleHREb2N1bWVudFBhcnNl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9UZXh0RG9jdW1lbnRQYXJzZXIuY3Bw CmluZGV4IDczNGVkZjA5ZjgzNmZhNjllYzJlY2I4MWVmNDc4NTdmNGRhMjI5MGQuLjc0MmZiZjdm MGUyN2M2NjE2MTg3ZmRhOGEwYWYxY2EzN2I4MzZjOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL1RleHREb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvVGV4dERvY3VtZW50UGFyc2VyLmNwcApAQCAtNjAsOCArNjAsOCBAQCB2 b2lkIFRleHREb2N1bWVudFBhcnNlcjo6aW5zZXJ0RmFrZVByZUVsZW1lbnQoKQogICAgIC8vIHNl bmRpbmcgZmFrZSBieXRlcyB0aHJvdWdoIHRoZSBmcm9udC1lbmQgb2YgdGhlIHBhcnNlciB0byBh dm9pZAogICAgIC8vIGRpc3RydWJpbmcgdGhlIGxpbmUvY29sdW1uIG51bWJlciBjYWxjdWxhdGlv bnMuCiAKLSAgICBWZWN0b3I8QXR0cmlidXRlPiBhdHRyaWJ1dGVzOwotICAgIGF0dHJpYnV0ZXMu YXBwZW5kKEF0dHJpYnV0ZShzdHlsZUF0dHIsICJ3b3JkLXdyYXA6IGJyZWFrLXdvcmQ7IHdoaXRl LXNwYWNlOiBwcmUtd3JhcDsiKSk7CisgICAgQXR0cmlidXRlVmVjdG9yIGF0dHJpYnV0ZXM7Cisg ICAgYXR0cmlidXRlcy5pbnNlcnRBdHRyaWJ1dGUoQXR0cmlidXRlKCJzdHlsZSIsICJ3b3JkLXdy YXA6IGJyZWFrLXdvcmQ7IHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsiKSk7CiAgICAgQXRvbWljSFRN TFRva2VuIGZha2VQcmUoSFRNTFRva2VuVHlwZXM6OlN0YXJ0VGFnLCBwcmVUYWcubG9jYWxOYW1l KCksIGF0dHJpYnV0ZXMpOwogCiAgICAgdHJlZUJ1aWxkZXIoKS0+Y29uc3RydWN0VHJlZUZyb21B dG9taWNUb2tlbihmYWtlUHJlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxF cnJvcnMuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEVycm9ycy5jcHAKaW5kZXggMDNkMGUw NmZhMTk0OGJkMjZhYjg5MjM0YWU3MWJkMTEzM2Y1NDFiYy4uMzg1MTEzNTliMDMxZTljMjdlNDhk MzJjYTUzODk1MzYwY2FkMzZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEVy cm9ycy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEVycm9ycy5jcHAKQEAgLTkxLDcg KzkxLDcgQEAgc3RhdGljIGlubGluZSBQYXNzUmVmUHRyPEVsZW1lbnQ+IGNyZWF0ZVhIVE1MUGFy c2VyRXJyb3JIZWFkZXIoRG9jdW1lbnQqIGRvYywgY28KIHsKICAgICBSZWZQdHI8RWxlbWVudD4g cmVwb3J0RWxlbWVudCA9IGRvYy0+Y3JlYXRlRWxlbWVudChRdWFsaWZpZWROYW1lKG51bGxBdG9t LCAicGFyc2VyZXJyb3IiLCB4aHRtbE5hbWVzcGFjZVVSSSksIHRydWUpOwogCi0gICAgVmVjdG9y PEF0dHJpYnV0ZT4gcmVwb3J0QXR0cmlidXRlczsKKyAgICBBdHRyaWJ1dGVWZWN0b3IgcmVwb3J0 QXR0cmlidXRlczsKICAgICByZXBvcnRBdHRyaWJ1dGVzLmFwcGVuZChBdHRyaWJ1dGUoc3R5bGVB dHRyLCAiZGlzcGxheTogYmxvY2s7IHdoaXRlLXNwYWNlOiBwcmU7IGJvcmRlcjogMnB4IHNvbGlk ICNjNzc7IHBhZGRpbmc6IDAgMWVtIDAgMWVtOyBtYXJnaW46IDFlbTsgYmFja2dyb3VuZC1jb2xv cjogI2ZkZDsgY29sb3I6IGJsYWNrIikpOwogICAgIHJlcG9ydEVsZW1lbnQtPnBhcnNlclNldEF0 dHJpYnV0ZXMocmVwb3J0QXR0cmlidXRlcywgRnJhZ21lbnRTY3JpcHRpbmdOb3RBbGxvd2VkKTsK IApAQCAtMTAwLDcgKzEwMCw3IEBAIHN0YXRpYyBpbmxpbmUgUGFzc1JlZlB0cjxFbGVtZW50PiBj cmVhdGVYSFRNTFBhcnNlckVycm9ySGVhZGVyKERvY3VtZW50KiBkb2MsIGNvCiAgICAgaDMtPnBh cnNlckFkZENoaWxkKGRvYy0+Y3JlYXRlVGV4dE5vZGUoIlRoaXMgcGFnZSBjb250YWlucyB0aGUg Zm9sbG93aW5nIGVycm9yczoiKSk7CiAKICAgICBSZWZQdHI8RWxlbWVudD4gZml4ZWQgPSBkb2Mt PmNyZWF0ZUVsZW1lbnQoZGl2VGFnLCB0cnVlKTsKLSAgICBWZWN0b3I8QXR0cmlidXRlPiBmaXhl ZEF0dHJpYnV0ZXM7CisgICAgQXR0cmlidXRlVmVjdG9yIGZpeGVkQXR0cmlidXRlczsKICAgICBm aXhlZEF0dHJpYnV0ZXMuYXBwZW5kKEF0dHJpYnV0ZShzdHlsZUF0dHIsICJmb250LWZhbWlseTpt b25vc3BhY2U7Zm9udC1zaXplOjEycHgiKSk7CiAgICAgZml4ZWQtPnBhcnNlclNldEF0dHJpYnV0 ZXMoZml4ZWRBdHRyaWJ1dGVzLCBGcmFnbWVudFNjcmlwdGluZ05vdEFsbG93ZWQpOwogICAgIHJl cG9ydEVsZW1lbnQtPnBhcnNlckFkZENoaWxkKGZpeGVkLmdldCgpKTsKQEAgLTE1OCw3ICsxNTgs NyBAQCB2b2lkIFhNTEVycm9yczo6aW5zZXJ0RXJyb3JNZXNzYWdlQmxvY2soKQogCiAjaWYgRU5B QkxFKFhTTFQpCiAgICAgaWYgKG1fZG9jdW1lbnQtPnRyYW5zZm9ybVNvdXJjZURvY3VtZW50KCkp IHsKLSAgICAgICAgVmVjdG9yPEF0dHJpYnV0ZT4gYXR0cmlidXRlczsKKyAgICAgICAgQXR0cmli dXRlVmVjdG9yIGF0dHJpYnV0ZXM7CiAgICAgICAgIGF0dHJpYnV0ZXMuYXBwZW5kKEF0dHJpYnV0 ZShzdHlsZUF0dHIsICJ3aGl0ZS1zcGFjZTogbm9ybWFsIikpOwogICAgICAgICBSZWZQdHI8RWxl bWVudD4gcGFyYWdyYXBoID0gbV9kb2N1bWVudC0+Y3JlYXRlRWxlbWVudChwVGFnLCB0cnVlKTsK ICAgICAgICAgcGFyYWdyYXBoLT5wYXJzZXJTZXRBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMsIEZyYWdt ZW50U2NyaXB0aW5nTm90QWxsb3dlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwv cGFyc2VyL01hcmt1cFRva2VuQmFzZS5oIGIvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9NYXJr dXBUb2tlbkJhc2UuaAppbmRleCAyOWU2OGI3MzYwMDc3MzgzOWQ2OThkNzExMzZmODhmZWY5NTYz N2I5Li4xYzk2YTRlODE3NDc5ZjFjNTcxODZiYTAyZWNiMjA2ZDY2MTRlYzYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL01hcmt1cFRva2VuQmFzZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3htbC9wYXJzZXIvTWFya3VwVG9rZW5CYXNlLmgKQEAgLTQwOSw3ICs0MDksNyBA QCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBBdG9taWNNYXJrdXBUb2tlbkJhc2Uo dHlwZW5hbWUgVG9rZW46OlR5cGU6OlR5cGUgdHlwZSwgQXRvbWljU3RyaW5nIG5hbWUsIGNvbnN0 IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1dGVzID0gVmVjdG9yPEF0dHJpYnV0ZT4oKSkKKyAg ICBBdG9taWNNYXJrdXBUb2tlbkJhc2UodHlwZW5hbWUgVG9rZW46OlR5cGU6OlR5cGUgdHlwZSwg QXRvbWljU3RyaW5nIG5hbWUsIGNvbnN0IEF0dHJpYnV0ZVZlY3RvciYgYXR0cmlidXRlcyA9IEF0 dHJpYnV0ZVZlY3RvcigpKQogICAgICAgICA6IG1fdHlwZSh0eXBlKQogICAgICAgICAsIG1fbmFt ZShuYW1lKQogICAgICAgICAsIG1fZXh0ZXJuYWxDaGFyYWN0ZXJzKDApCkBAIC00NDEsMTYgKzQ0 MSwxNiBAQCBwdWJsaWM6CiAgICAgQXR0cmlidXRlKiBnZXRBdHRyaWJ1dGVJdGVtKGNvbnN0IFF1 YWxpZmllZE5hbWUmIGF0dHJpYnV0ZU5hbWUpCiAgICAgewogICAgICAgICBBU1NFUlQodXNlc0F0 dHJpYnV0ZXMoKSk7Ci0gICAgICAgIHJldHVybiBmaW5kQXR0cmlidXRlSW5WZWN0b3IobV9hdHRy aWJ1dGVzLCBhdHRyaWJ1dGVOYW1lKTsKKyAgICAgICAgcmV0dXJuIG1fYXR0cmlidXRlcy5nZXRB dHRyaWJ1dGVJdGVtKGF0dHJpYnV0ZU5hbWUpOwogICAgIH0KIAotICAgIFZlY3RvcjxBdHRyaWJ1 dGU+JiBhdHRyaWJ1dGVzKCkKKyAgICBBdHRyaWJ1dGVWZWN0b3ImIGF0dHJpYnV0ZXMoKQogICAg IHsKICAgICAgICAgQVNTRVJUKHVzZXNBdHRyaWJ1dGVzKCkpOwogICAgICAgICByZXR1cm4gbV9h dHRyaWJ1dGVzOwogICAgIH0KIAotICAgIGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1 dGVzKCkgY29uc3QKKyAgICBjb25zdCBBdHRyaWJ1dGVWZWN0b3ImIGF0dHJpYnV0ZXMoKSBjb25z dAogICAgIHsKICAgICAgICAgQVNTRVJUKHVzZXNBdHRyaWJ1dGVzKCkpOwogICAgICAgICByZXR1 cm4gbV9hdHRyaWJ1dGVzOwpAQCAtNTE0LDcgKzUxNCw3IEBAIHByb3RlY3RlZDoKICAgICAvLyBG b3IgU3RhcnRUYWcgYW5kIEVuZFRhZwogICAgIGJvb2wgbV9zZWxmQ2xvc2luZzsKIAotICAgIFZl Y3RvcjxBdHRyaWJ1dGU+IG1fYXR0cmlidXRlczsKKyAgICBBdHRyaWJ1dGVWZWN0b3IgbV9hdHRy aWJ1dGVzOwogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVG9rZW4+CkBAIC01MzksOSArNTM5LDcg QEAgaW5saW5lIHZvaWQgQXRvbWljTWFya3VwVG9rZW5CYXNlPFRva2VuPjo6aW5pdGlhbGl6ZUF0 dHJpYnV0ZXMoY29uc3QgdHlwZW5hbWUgVG8KICAgICAgICAgQVNTRVJUKGF0dHJpYnV0ZS5tX3Zh bHVlUmFuZ2UubV9lbmQpOwogCiAgICAgICAgIEF0b21pY1N0cmluZyB2YWx1ZShhdHRyaWJ1dGUu bV92YWx1ZS5kYXRhKCksIGF0dHJpYnV0ZS5tX3ZhbHVlLnNpemUoKSk7Ci0gICAgICAgIGNvbnN0 IFF1YWxpZmllZE5hbWUgbmFtZSA9IG5hbWVGb3JBdHRyaWJ1dGUoYXR0cmlidXRlKTsKLSAgICAg ICAgaWYgKCFmaW5kQXR0cmlidXRlSW5WZWN0b3IobV9hdHRyaWJ1dGVzLCBuYW1lKSkKLSAgICAg ICAgICAgIG1fYXR0cmlidXRlcy5hcHBlbmQoQXR0cmlidXRlKG5hbWUsIHZhbHVlKSk7CisgICAg ICAgIG1fYXR0cmlidXRlcy5pbnNlcnRBdHRyaWJ1dGUoQXR0cmlidXRlKG5hbWVGb3JBdHRyaWJ1 dGUoYXR0cmlidXRlKSwgdmFsdWUpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3htbC9wYXJzZXIvWE1MVG9rZW4uaCBiL1NvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIv WE1MVG9rZW4uaAppbmRleCBlY2YxMmIxMzczNGM1ZjMyN2ZlNDBmYzM4MWY1NGMwMjc2MTNmNzA1 Li42ZTE0YTExYTMxMzVhMzkwZDMyNzhiNWQxNmY2NzgyNjdmODQ0MjAzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTFRva2VuLmgKKysrIGIvU291cmNlL1dlYkNvcmUv eG1sL3BhcnNlci9YTUxUb2tlbi5oCkBAIC00MzEsNyArNDMxLDcgQEAgcHVibGljOgogICAgICAg ICB9CiAgICAgfQogCi0gICAgQXRvbWljWE1MVG9rZW4oWE1MVG9rZW5UeXBlczo6VHlwZSB0eXBl LCBBdG9taWNTdHJpbmcgbmFtZSwgY29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMg PSBWZWN0b3I8QXR0cmlidXRlPigpKQorICAgIEF0b21pY1hNTFRva2VuKFhNTFRva2VuVHlwZXM6 OlR5cGUgdHlwZSwgQXRvbWljU3RyaW5nIG5hbWUsIGNvbnN0IEF0dHJpYnV0ZVZlY3RvciYgYXR0 cmlidXRlcyA9IEF0dHJpYnV0ZVZlY3RvcigpKQogICAgICAgICA6IEF0b21pY01hcmt1cFRva2Vu QmFzZTxYTUxUb2tlbj4odHlwZSwgbmFtZSwgYXR0cmlidXRlcykKICAgICB7CiAgICAgfQo=