143971 2015-04-20 16:48:49 -0700 Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion 2015-04-21 09:17:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez ap cmarcelo commit-queue ddkilzer esprehn+autocc kangil.han WebkitBugTracker oldest_to_newest 1086948 0 cdumez 2015-04-20 16:48:49 -0700 Use ASSERT_WITH_SECURITY_IMPLICATION() for NoEventDispatchAssertion as firing JS events can cause arbitrary JS execution which often leads to security bugs when event firing is forbidden. For e.g. firing events from ActiveDOMObject::suspend() means JS can construct or destroy ActiveDOMObjects while we are iterating over them. 1086949 1 251204 cdumez 2015-04-20 16:55:04 -0700 Created attachment 251204 Patch 1087065 2 251204 cdumez 2015-04-21 09:17:26 -0700 Comment on attachment 251204 Patch Clearing flags on attachment: 251204 Committed r183064: <http://trac.webkit.org/changeset/183064> 1087066 3 cdumez 2015-04-21 09:17:34 -0700 All reviewed patches have been landed. Closing bug. 251204 2015-04-20 16:55:04 -0700 2015-04-21 09:17:26 -0700 Patch bug-143971-20150420165402.patch text/plain 13434 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQyNzA5ZTFjNWU2ZDE2 NGY2NTAzMjBjMTgyZDI2ZjUzMTQ4ODYxZC4uYmRmYWE0OWY4ZmNmNjNiNTRhMDliOTM4YzZjY2Rm NDFjZTJlZTBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE1LTA0LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEFTU0VSVF9XSVRIX1NF Q1VSSVRZX0lNUExJQ0FUSU9OKCkgZm9yIE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzOTcxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEFTU0VSVF9XSVRI X1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCkgZm9yIE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbiBhcwor ICAgICAgICBmaXJpbmcgSlMgZXZlbnRzIGNhbiBjYXVzZSBhcmJpdHJhcnkgSlMgZXhlY3V0aW9u IHdoaWNoIG9mdGVuIGxlYWRzIHRvCisgICAgICAgIHNlY3VyaXR5IGJ1Z3Mgd2hlbiBldmVudCBm aXJpbmcgaXMgZm9yYmlkZGVuLiBGb3IgZS5nLiBmaXJpbmcgZXZlbnRzCisgICAgICAgIGZyb20g QWN0aXZlRE9NT2JqZWN0OjpzdXNwZW5kKCkgbWVhbnMgSlMgY2FuIGNvbnN0cnVjdCBvciBkZXN0 cm95CisgICAgICAgIEFjdGl2ZURPTU9iamVjdHMgd2hpbGUgd2UgYXJlIGl0ZXJhdGluZyBvdmVy IHRoZW0uCisKKyAgICAgICAgKiBkb20vQ29udGFpbmVyTm9kZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpkaXNwYXRjaENoaWxkSW5zZXJ0aW9uRXZlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OmRp c3BhdGNoQ2hpbGRSZW1vdmFsRXZlbnRzKToKKyAgICAgICAgKiBkb20vQ29udGFpbmVyTm9kZUFs Z29yaXRobXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNoaWxkTm9kZUluc2VydGlvbk5vdGlmaWVy Ojpub3RpZnkpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudDo6ZGlzcGF0Y2hXaW5kb3dFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6ZGlzcGF0Y2hXaW5kb3dMb2FkRXZlbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmRpc3BhdGNoRm9jdXNJbkV2ZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmRpc3BhdGNoRm9jdXNPdXRFdmVudCk6CisgICAgICAg ICogZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudERpc3Bh dGNoZXI6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAqIGRvbS9FdmVudFRhcmdldC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudFRhcmdldDo6ZmlyZUV2ZW50TGlzdGVuZXJzKToKKyAgICAg ICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkaXNwYXRjaFN1YnRy ZWVNb2RpZmllZEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoRE9NQWN0 aXZhdGVFdmVudCk6CisgICAgICAgICogZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Y2FuU3VzcGVuZEFjdGl2 ZURPTU9iamVjdHNGb3JQYWdlQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0 aW9uQ29udGV4dDo6c3VzcGVuZEFjdGl2ZURPTU9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6 U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0cyk6CisgICAgICAg IChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzdG9wQWN0aXZlRE9NT2JqZWN0cyk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojp3aWxsRGVzdHJveUFj dGl2ZURPTU9iamVjdCk6CisgICAgICAgICogZG9tL1dlYktpdE5hbWVkRmxvdy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJLaXROYW1lZEZsb3c6OmRpc3BhdGNoUmVnaW9uT3ZlcnNldENoYW5n ZUV2ZW50KToKKwogMjAxNS0wNC0yMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIE92ZXJ3cml0ZSBleGlzdGluZyBmaWxlcyB3aXRoIG1vdmVG aWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IDFmNmE3N2ZlYTYxZWM3 NjM3NWZiYjkwMzRiM2E3NTNmMTI1YTVjMmUuLjE5MzZjNDczYWQ3YWE3NWU4ZGYwZGIyYzk0YzIx Mjg3YjQ0Yjg3YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKQEAgLTc5OSw3 ICs3OTksNyBAQCBzdGF0aWMgdm9pZCBkaXNwYXRjaENoaWxkSW5zZXJ0aW9uRXZlbnRzKE5vZGUm IGNoaWxkKQogICAgIGlmIChjaGlsZC5pc0luU2hhZG93VHJlZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBBU1NFUlQoIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNo Rm9yYmlkZGVuKCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2 ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKIAogICAg IFJlZlB0cjxOb2RlPiBjID0gJmNoaWxkOwogICAgIFJlZjxEb2N1bWVudD4gZG9jdW1lbnQoY2hp bGQuZG9jdW1lbnQoKSk7CkBAIC04MjEsNyArODIxLDcgQEAgc3RhdGljIHZvaWQgZGlzcGF0Y2hD aGlsZFJlbW92YWxFdmVudHMoTm9kZSYgY2hpbGQpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBBU1NFUlQoIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9y YmlkZGVuKCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2ZW50 RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKIAogICAgIHdp bGxDcmVhdGVQb3NzaWJseU9ycGhhbmVkVHJlZUJ5UmVtb3ZhbCgmY2hpbGQpOwogICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFJlbW92ZURPTU5vZGUoY2hpbGQuZG9jdW1lbnQoKSwg Y2hpbGQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGVBbGdv cml0aG1zLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZUFsZ29yaXRobXMuaApp bmRleCA4OGM5NGNmMDQ0MDFkODI0OWEzMDhlNDYwOGFmNjkyM2QyZTUyNGRkLi41YmYxNWYwZTli N2EzMWNhMjVjOTY5MWJiMGExYWYzODFhNzZiNzFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vQ29udGFpbmVyTm9kZUFsZ29yaXRobXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v Q29udGFpbmVyTm9kZUFsZ29yaXRobXMuaApAQCAtMjE0LDcgKzIxNCw3IEBAIGlubGluZSB2b2lk IENoaWxkTm9kZUluc2VydGlvbk5vdGlmaWVyOjpub3RpZnlOb2RlSW5zZXJ0ZWRJbnRvVHJlZShD b250YWluZXJOb2RlCiAKIGlubGluZSB2b2lkIENoaWxkTm9kZUluc2VydGlvbk5vdGlmaWVyOjpu b3RpZnkoTm9kZSYgbm9kZSkKIHsKLSAgICBBU1NFUlQoIU5vRXZlbnREaXNwYXRjaEFzc2VydGlv bjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZ X0lNUExJQ0FUSU9OKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZv cmJpZGRlbigpKTsKIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkSW5zZXJ0RE9N Tm9kZShub2RlLmRvY3VtZW50KCksIG5vZGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl eCBhM2U2M2I2YzVkZDNiMjhmZDBjNmNhNmJhZjg0ODIxNDU5YTg3ZWE4Li5hYTFmYWVjOTMxOGJi Y2JjNzVlNTdiNGNlNTFmMWI2Y2E3Yzg0ZWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg LTM5MjUsNyArMzkyNSw3IEBAIEV2ZW50TGlzdGVuZXIqIERvY3VtZW50OjpnZXRXaW5kb3dBdHRy aWJ1dGVFdmVudExpc3RlbmVyKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlCiAKIHZvaWQgRG9jdW1l bnQ6OmRpc3BhdGNoV2luZG93RXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQsICBQYXNzUmVm UHRyPEV2ZW50VGFyZ2V0PiB0YXJnZXQpCiB7Ci0gICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hB c3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKKyAgICBBU1NFUlRfV0lUSF9T RUNVUklUWV9JTVBMSUNBVElPTighTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlz cGF0Y2hGb3JiaWRkZW4oKSk7CiAgICAgaWYgKCFtX2RvbVdpbmRvdykKICAgICAgICAgcmV0dXJu OwogICAgIG1fZG9tV2luZG93LT5kaXNwYXRjaEV2ZW50KGV2ZW50LCB0YXJnZXQpOwpAQCAtMzkz Myw3ICszOTMzLDcgQEAgdm9pZCBEb2N1bWVudDo6ZGlzcGF0Y2hXaW5kb3dFdmVudChQYXNzUmVm UHRyPEV2ZW50PiBldmVudCwgIFBhc3NSZWZQdHI8RXZlbnRUYXIKIAogdm9pZCBEb2N1bWVudDo6 ZGlzcGF0Y2hXaW5kb3dMb2FkRXZlbnQoKQogewotICAgIEFTU0VSVCghTm9FdmVudERpc3BhdGNo QXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7CisgICAgQVNTRVJUX1dJVEhf U0VDVVJJVFlfSU1QTElDQVRJT04oIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERp c3BhdGNoRm9yYmlkZGVuKCkpOwogICAgIGlmICghbV9kb21XaW5kb3cpCiAgICAgICAgIHJldHVy bjsKICAgICBtX2RvbVdpbmRvdy0+ZGlzcGF0Y2hMb2FkRXZlbnQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcAppbmRleCBmZDFhZGVhYzEwMzVmZDIyMGUwMzRiZGVmMzgxZDJmYzVkMDQzZTU2Li5mOTZm YWNiZWIzZTA3MzcyNWFkMDgzMjI2YjVmZDlhMTRjMmY5NjE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCkBAIC0yMjEzLDE0ICsyMjEzLDE0IEBAIHZvaWQgRWxlbWVudDo6Ymx1cigpCiAKIHZvaWQg RWxlbWVudDo6ZGlzcGF0Y2hGb2N1c0luRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5 cGUsIFJlZlB0cjxFbGVtZW50PiYmIG9sZEZvY3VzZWRFbGVtZW50KQogewotICAgIEFTU0VSVCgh Tm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7Cisg ICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIU5vRXZlbnREaXNwYXRjaEFzc2Vy dGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOwogICAgIEFTU0VSVChldmVudFR5cGUg PT0gZXZlbnROYW1lcygpLmZvY3VzaW5FdmVudCB8fCBldmVudFR5cGUgPT0gZXZlbnROYW1lcygp LkRPTUZvY3VzSW5FdmVudCk7CiAgICAgZGlzcGF0Y2hTY29wZWRFdmVudChGb2N1c0V2ZW50Ojpj cmVhdGUoZXZlbnRUeXBlLCB0cnVlLCBmYWxzZSwgZG9jdW1lbnQoKS5kZWZhdWx0VmlldygpLCAw LCBXVEY6Om1vdmUob2xkRm9jdXNlZEVsZW1lbnQpKSk7CiB9CiAKIHZvaWQgRWxlbWVudDo6ZGlz cGF0Y2hGb2N1c091dEV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBSZWZQdHI8 RWxlbWVudD4mJiBuZXdGb2N1c2VkRWxlbWVudCkKIHsKLSAgICBBU1NFUlQoIU5vRXZlbnREaXNw YXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOworICAgIEFTU0VSVF9X SVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZl bnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBBU1NFUlQoZXZlbnRUeXBlID09IGV2ZW50TmFt ZXMoKS5mb2N1c291dEV2ZW50IHx8IGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNP dXRFdmVudCk7CiAgICAgZGlzcGF0Y2hTY29wZWRFdmVudChGb2N1c0V2ZW50OjpjcmVhdGUoZXZl bnRUeXBlLCB0cnVlLCBmYWxzZSwgZG9jdW1lbnQoKS5kZWZhdWx0VmlldygpLCAwLCBXVEY6Om1v dmUobmV3Rm9jdXNlZEVsZW1lbnQpKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRXZlbnREaXNwYXRjaGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNo ZXIuY3BwCmluZGV4IDJkOTJmODA4YThhMzc0ZDU4NDA0Y2QwOWFkMDVmNGY3NWNjZDIzNWQuLjgw NzI3NDA3OGEzNWZiYzc3ZWFiMGFiNDU2MGY5YzY1NGY0YzAwZDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FdmVudERpc3BhdGNoZXIuY3BwCkBAIC0zMTksNyArMzE5LDcgQEAgc3RhdGljIHZvaWQgZGlz cGF0Y2hFdmVudEluRE9NKEV2ZW50JiBldmVudCwgY29uc3QgRXZlbnRQYXRoJiBwYXRoLCBXaW5k b3dFdmVudEMKIAogYm9vbCBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQoTm9kZSogb3Jp Z2luLCBQYXNzUmVmUHRyPEV2ZW50PiBwcnBFdmVudCkKIHsKLSAgICBBU1NFUlQoIU5vRXZlbnRE aXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOworICAgIEFTU0VS VF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246Omlz RXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBpZiAoIXBycEV2ZW50KQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIApAQCAtMzQxLDcgKzM0MSw3IEBAIGJvb2wgRXZlbnREaXNwYXRjaGVyOjpk aXNwYXRjaEV2ZW50KE5vZGUqIG9yaWdpbiwgUGFzc1JlZlB0cjxFdmVudD4gcHJwRXZlbnQpCiAg ICAgQ2hpbGROb2Rlc0xhenlTbmFwc2hvdDo6dGFrZUNoaWxkTm9kZXNMYXp5U25hcHNob3QoKTsK IAogICAgIGV2ZW50LT5zZXRUYXJnZXQoJmV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVz KCpub2RlKSk7Ci0gICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnRE aXNwYXRjaEZvcmJpZGRlbigpKTsKKyAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP TighTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7 CiAgICAgQVNTRVJUKGV2ZW50LT50YXJnZXQoKSk7CiAgICAgV2luZG93RXZlbnRDb250ZXh0IHdp bmRvd0V2ZW50Q29udGV4dChub2RlLmdldCgpLCBldmVudFBhdGgubGFzdENvbnRleHRJZkV4aXN0 cygpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFRhcmdldC5jcHAKaW5kZXggZmZlNzg2NDk1ZGE5MWY5 NmZjYzgzMjc2ZmM4Njk5MzgzZDIwZWM4Ni4uMWU1MTU3NzVjNTYyYzUzYWUxYmQ3NTM4NTAzYjMx Zjc3MTZhZmIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRUYXJnZXQuY3BwCkBAIC0xOTAsNyArMTkw LDcgQEAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgbGVnYWN5VHlwZShjb25zdCBFdmVudCog ZXZlbnQpCiAKIGJvb2wgRXZlbnRUYXJnZXQ6OmZpcmVFdmVudExpc3RlbmVycyhFdmVudCogZXZl bnQpCiB7Ci0gICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNw YXRjaEZvcmJpZGRlbigpKTsKKyAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTigh Tm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7CiAg ICAgQVNTRVJUKGV2ZW50ICYmICFldmVudC0+dHlwZSgpLmlzRW1wdHkoKSk7CiAKICAgICBFdmVu dFRhcmdldERhdGEqIGQgPSBldmVudFRhcmdldERhdGEoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA2 NzY1NzdiZGU4OTQ0MGFiZGY2OGQ4Y2JjMDAxZjJkYjgyMTRhOWUyLi5jOGJjYjhhYWI5MDQ1Yjdj NDBkYzY1NjM4MmExMDg1N2QxZDRkODM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yMDA1LDcgKzIw MDUsNyBAQCB2b2lkIE5vZGU6OmRpc3BhdGNoU3VidHJlZU1vZGlmaWVkRXZlbnQoKQogICAgIGlm IChpc0luU2hhZG93VHJlZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBBU1NFUlQoIU5vRXZl bnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOworICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246 OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKIAogICAgIGlmICghZG9jdW1lbnQoKS5oYXNM aXN0ZW5lclR5cGUoRG9jdW1lbnQ6OkRPTVNVQlRSRUVNT0RJRklFRF9MSVNURU5FUikpCiAgICAg ICAgIHJldHVybjsKQEAgLTIwMTgsNyArMjAxOCw3IEBAIHZvaWQgTm9kZTo6ZGlzcGF0Y2hTdWJ0 cmVlTW9kaWZpZWRFdmVudCgpCiAKIGJvb2wgTm9kZTo6ZGlzcGF0Y2hET01BY3RpdmF0ZUV2ZW50 KGludCBkZXRhaWwsIFBhc3NSZWZQdHI8RXZlbnQ+IHVuZGVybHlpbmdFdmVudCkKIHsKLSAgICBB U1NFUlQoIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVu KCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFOb0V2ZW50RGlzcGF0 Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBSZWZQdHI8VUlF dmVudD4gZXZlbnQgPSBVSUV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLkRPTUFjdGl2YXRlRXZl bnQsIHRydWUsIHRydWUsIGRvY3VtZW50KCkuZGVmYXVsdFZpZXcoKSwgZGV0YWlsKTsKICAgICBl dmVudC0+c2V0VW5kZXJseWluZ0V2ZW50KHVuZGVybHlpbmdFdmVudCk7CiAgICAgZGlzcGF0Y2hT Y29wZWRFdmVudChldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0 RXhlY3V0aW9uQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9u Q29udGV4dC5jcHAKaW5kZXggYzlkYmQ4YTkwOWEyMGM2OWI1YjFjZDhjY2QxZmE4MDQwNzQ5ZDJl ZS4uMjcxNmM1ZTlhMjhkYWQ0ZGM2YTZkMGRjNjdmOTJlZjU2ZmZjZWM2MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcApAQCAtMTg3LDggKzE4Nyw5 IEBAIGJvb2wgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVj dHNGb3JQYWdlQ2FjaGUoVmVjdG9yPEFjdGl2CiAKICAgICAvLyBXZSBhc3N1bWUgdGhhdCBtX2Fj dGl2ZURPTU9iamVjdHMgd2lsbCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRpb246IGNhblN1c3Bl bmQKICAgICAvLyBmdW5jdGlvbnMgc2hvdWxkIG5vdCBhZGQgbmV3IGFjdGl2ZSBET00gb2JqZWN0 cywgbm9yIGV4ZWN1dGUgYXJiaXRyYXJ5IEphdmFTY3JpcHQuCi0gICAgLy8gQW4gQVNTRVJUIG9y IFJFTEVBU0VfQVNTRVJUIHdpbGwgZmlyZSBpZiB0aGlzIGhhcHBlbnMsIGJ1dCBpdCdzIGltcG9y dGFudCB0byBjb2RlCisgICAgLy8gQW4gQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04g b3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1w b3J0YW50IHRvIGNvZGUKICAgICAvLyBjYW5TdXNwZW5kIGZ1bmN0aW9ucyBzbyBpdCB3aWxsIG5v dCBoYXBwZW4hCisgICAgTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uIGFzc2VydE5vRXZlbnREaXNw YXRjaDsKICAgICBmb3IgKGF1dG8qIGFjdGl2ZURPTU9iamVjdCA6IG1fYWN0aXZlRE9NT2JqZWN0 cykgewogICAgICAgICBpZiAoIWFjdGl2ZURPTU9iamVjdC0+Y2FuU3VzcGVuZEZvclBhZ2VDYWNo ZSgpKSB7CiAgICAgICAgICAgICBjYW5TdXNwZW5kID0gZmFsc2U7CkBAIC0yMjUsNyArMjI2LDcg QEAgdm9pZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyhB Y3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclMKIAogICAgIC8vIFdlIGFzc3VtZSB0aGF0IG1fYWN0 aXZlRE9NT2JqZWN0cyB3aWxsIG5vdCBjaGFuZ2UgZHVyaW5nIGl0ZXJhdGlvbjogc3VzcGVuZAog ICAgIC8vIGZ1bmN0aW9ucyBzaG91bGQgbm90IGFkZCBuZXcgYWN0aXZlIERPTSBvYmplY3RzLCBu b3IgZXhlY3V0ZSBhcmJpdHJhcnkgSmF2YVNjcmlwdC4KLSAgICAvLyBBbiBBU1NFUlQgb3IgUkVM RUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0IGl0J3MgaW1wb3J0YW50 IHRvIGNvZGUKKyAgICAvLyBBbiBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTiBvciBS RUxFQVNFX0FTU0VSVCB3aWxsIGZpcmUgaWYgdGhpcyBoYXBwZW5zLCBidXQgaXQncyBpbXBvcnRh bnQgdG8gY29kZQogICAgIC8vIHN1c3BlbmQgZnVuY3Rpb25zIHNvIGl0IHdpbGwgbm90IGhhcHBl biEKICAgICBOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb24gYXNzZXJ0Tm9FdmVudERpc3BhdGNoOwog ICAgIGZvciAoYXV0byogYWN0aXZlRE9NT2JqZWN0IDogbV9hY3RpdmVET01PYmplY3RzKQpAQCAt MjU1LDcgKzI1Niw3IEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6cmVzdW1lQWN0aXZl RE9NT2JqZWN0cyhBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1CiAKICAgICAvLyBXZSBhc3N1 bWUgdGhhdCBtX2FjdGl2ZURPTU9iamVjdHMgd2lsbCBub3QgY2hhbmdlIGR1cmluZyBpdGVyYXRp b246IHJlc3VtZQogICAgIC8vIGZ1bmN0aW9ucyBzaG91bGQgbm90IGFkZCBuZXcgYWN0aXZlIERP TSBvYmplY3RzLCBub3IgZXhlY3V0ZSBhcmJpdHJhcnkgSmF2YVNjcmlwdC4KLSAgICAvLyBBbiBB U1NFUlQgb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0IGl0 J3MgaW1wb3J0YW50IHRvIGNvZGUKKyAgICAvLyBBbiBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBM SUNBVElPTiBvciBSRUxFQVNFX0FTU0VSVCB3aWxsIGZpcmUgaWYgdGhpcyBoYXBwZW5zLCBidXQg aXQncyBpbXBvcnRhbnQgdG8gY29kZQogICAgIC8vIHJlc3VtZSBmdW5jdGlvbnMgc28gaXQgd2ls bCBub3QgaGFwcGVuIQogICAgIE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbiBhc3NlcnROb0V2ZW50 RGlzcGF0Y2g7CiAgICAgZm9yIChhdXRvKiBhY3RpdmVET01PYmplY3QgOiBtX2FjdGl2ZURPTU9i amVjdHMpCkBAIC0yODMsNyArMjg0LDcgQEAgdm9pZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojpz dG9wQWN0aXZlRE9NT2JqZWN0cygpCiAKICAgICAvLyBXZSBhc3N1bWUgdGhhdCBuZXcgb2JqZWN0 cyB3aWxsIG5vdCBiZSBhZGRlZCB0byBtX2FjdGl2ZURPTU9iamVjdHMgZHVyaW5nIGl0ZXJhdGlv bjoKICAgICAvLyBzdG9wIGZ1bmN0aW9ucyBzaG91bGQgbm90IGFkZCBuZXcgYWN0aXZlIERPTSBv YmplY3RzLCBub3IgZXhlY3V0ZSBhcmJpdHJhcnkgSmF2YVNjcmlwdC4KLSAgICAvLyBBIFJFTEVB U0VfQVNTRVJUIHdpbGwgZmlyZSBpZiB0aGlzIGhhcHBlbnMsIGJ1dCBpdCdzIGltcG9ydGFudCB0 byBjb2RlIHN0b3AgZnVuY3Rpb25zCisgICAgLy8gQW4gQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1Q TElDQVRJT04gb3IgUkVMRUFTRV9BU1NFUlQgd2lsbCBmaXJlIGlmIHRoaXMgaGFwcGVucywgYnV0 IGl0J3MgaW1wb3J0YW50IHRvIGNvZGUgc3RvcCBmdW5jdGlvbnMKICAgICAvLyBzbyBpdCB3aWxs IG5vdCBoYXBwZW4hCiAgICAgTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uIGFzc2VydE5vRXZlbnRE aXNwYXRjaDsKICAgICBmb3IgKGF1dG8qIGFjdGl2ZURPTU9iamVjdCA6IHBvc3NpYmxlQWN0aXZl RE9NT2JqZWN0cykgewpAQCAtMzI2LDcgKzMyNyw3IEBAIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dDo6ZGlkQ3JlYXRlQWN0aXZlRE9NT2JqZWN0KEFjdGl2ZURPTU9iamVjdCYgYWN0aXZlRE9N CiAKIHZvaWQgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6d2lsbERlc3Ryb3lBY3RpdmVET01PYmpl Y3QoQWN0aXZlRE9NT2JqZWN0JiBhY3RpdmVET01PYmplY3QpCiB7Ci0gICAgQVNTRVJUKCFtX2Fj dGl2ZURPTU9iamVjdFJlbW92YWxGb3JiaWRkZW4pOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZ X0lNUExJQ0FUSU9OKCFtX2FjdGl2ZURPTU9iamVjdFJlbW92YWxGb3JiaWRkZW4pOwogICAgIG1f YWN0aXZlRE9NT2JqZWN0cy5yZW1vdmUoJmFjdGl2ZURPTU9iamVjdCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL1dlYktpdE5hbWVkRmxvdy5jcHAKaW5kZXggNTFkZmMwYjljODgxZTcyZjExYzhkODFl YzExNTMwOWZlZGNiYzU1Zi4uODdjNGUxZjc2NjZhZTY1YmM1MzRkMGI4MDg0Mzc0ZjFlYWU4YjA2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1dlYktpdE5hbWVkRmxvdy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL1dlYktpdE5hbWVkRmxvdy5jcHAKQEAgLTIxMCw3ICsyMTAs NyBAQCB2b2lkIFdlYktpdE5hbWVkRmxvdzo6c2V0UmVuZGVyZXIoUmVuZGVyTmFtZWRGbG93VGhy ZWFkKiBwYXJlbnRGbG93VGhyZWFkKQogCiB2b2lkIFdlYktpdE5hbWVkRmxvdzo6ZGlzcGF0Y2hS ZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnQoKQogewotICAgIEFTU0VSVCghTm9FdmVudERpc3BhdGNo QXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7CisgICAgQVNTRVJUX1dJVEhf U0VDVVJJVFlfSU1QTElDQVRJT04oIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERp c3BhdGNoRm9yYmlkZGVuKCkpOwogICAgIAogICAgIC8vIElmIHRoZSBmbG93IGlzIGluIHRoZSAi TlVMTCIgc3RhdGUgdGhlIGV2ZW50IHNob3VsZCBub3QgYmUgZGlzcGF0Y2hlZCBhbnkgbW9yZS4K ICAgICBpZiAoZmxvd1N0YXRlKCkgPT0gRmxvd1N0YXRlTnVsbCkK