73582 2011-12-01 12:31:44 -0800 InspectorController destruction order leads to use-after-free 2011-12-12 15:19:11 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 adamk pfeldman ayao benjamin timothy yurys oldest_to_newest 512992 0 adamk 2011-12-01 12:31:44 -0800 After http://trac.webkit.org/changeset/101345, I'm seeing consistent Valgrind errors on the bots: http://build.chromium.org/p/chromium.webkit/builders/Linux%20Valgrind/builds/17144/steps/memory%20test%3A%20test_shell/logs/stdio Here's the top of the stack trace: InvalidWrite Invalid write of size 4 WebCore::InspectorDOMAgent::setDOMListener(WebCore::InspectorDOMAgent::DOMListener*) (third_party/WebKit/Source/WebCore/inspector/InspectorDOMAgent.cpp:254) WebCore::InspectorCSSAgent::~InspectorCSSAgent() (third_party/WebKit/Source/WebCore/inspector/InspectorCSSAgent.cpp:203) void WTF::deleteOwnedPtr<WebCore::InspectorBaseAgentInterface>(WebCore::InspectorBaseAgentInterface*) (third_party/WebKit/Source/JavaScriptCore/wtf/OwnPtrCommon.h:53) WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>::~OwnPtr() (third_party/WebKit/Source/JavaScriptCore/wtf/OwnPtr.h:54) WTF::VectorDestructor<true, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface> >::destruct(WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:58) WTF::VectorTypeOperations<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface> >::destruct(WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:217) WTF::Vector<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>, 0u>::shrink(unsigned int) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:840) WTF::Vector<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>, 0u>::~Vector() (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:498) WebCore::InspectorController::~InspectorController() (third_party/WebKit/Source/WebCore/inspector/InspectorController.cpp:155) ... Address 0xb112d20 is 32 bytes inside a block of size 172 free'd operator delete(void*) (m_replacemalloc/vg_replace_malloc.c:1083) WebCore::InspectorDOMAgent::~InspectorDOMAgent() (third_party/WebKit/Source/WebCore/inspector/InspectorDOMAgent.cpp:191) void WTF::deleteOwnedPtr<WebCore::InspectorBaseAgentInterface>(WebCore::InspectorBaseAgentInterface*) (third_party/WebKit/Source/JavaScriptCore/wtf/OwnPtrCommon.h:53) WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>::~OwnPtr() (third_party/WebKit/Source/JavaScriptCore/wtf/OwnPtr.h:54) WTF::VectorDestructor<true, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface> >::destruct(WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:58) WTF::VectorTypeOperations<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface> >::destruct(WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*, WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>*) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:217) WTF::Vector<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>, 0u>::shrink(unsigned int) (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:840) WTF::Vector<WTF::OwnPtr<WebCore::InspectorBaseAgentInterface>, 0u>::~Vector() (third_party/WebKit/Source/JavaScriptCore/wtf/Vector.h:498) WebCore::InspectorController::~InspectorController() (third_party/WebKit/Source/WebCore/inspector/InspectorController.cpp:155) ... The issue is that the InspectorDOMAgent passed to the InspectorCSSAgent is at an earlier index in the Vector<OwnPtr> than the CSSAgent, so it's deleted by the time ~InspectorCSSAgent tries to call setDOMListener(0). The same error exists for InspectorDebuggerAgent (it's also passed a handle to the InspectorDOMAgent, and tries to call setListener(0)). Easiest fix would be to change the order of the vector, putting the InspectorDOMAgent at the end; seems a bit fragile, though. 512996 1 pfeldman 2011-12-01 12:33:49 -0800 > Easiest fix would be to change the order of the vector, putting the InspectorDOMAgent at the end; seems a bit fragile, though. Thanks for the heads up, I'll handle it. 513012 2 timothy 2011-12-01 12:51:38 -0800 <rdar://problem/10508230> 513017 3 117466 pfeldman 2011-12-01 13:00:53 -0800 Created attachment 117466 [Patch] with the speculative fix. 513022 4 117466 webkit-ews 2011-12-01 13:04:02 -0800 Comment on attachment 117466 [Patch] with the speculative fix. Attachment 117466 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10703242 513027 5 117469 pfeldman 2011-12-01 13:07:56 -0800 Created attachment 117469 [Patch] with the speculative fix for ews (2). 513582 6 pfeldman 2011-12-02 00:22:15 -0800 Committed r101754: <http://trac.webkit.org/changeset/101754> 117466 2011-12-01 13:00:53 -0800 2011-12-01 13:07:49 -0800 [Patch] with the speculative fix. bug-73582-20111202010051.patch text/plain 5719 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBiMTJkYTYyYzc5ZWE1 ODYyNWUxYjRhNTk1ZmE1NmNhYTg1YjE4Yi4uMDljZWNhOWRiOTNkOTQ5Y2QzZmVkOWRjYmFjZGMw MTFhYTc0M2M5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEyLTAxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluc3BlY3RvckNv bnRyb2xsZXIgZGVzdHJ1Y3Rpb24gb3JkZXIgbGVhZHMgdG8gdXNlLWFmdGVyLWZyZWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNTgyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQmFzZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYXNlQWdlbnRJ bnRlcmZhY2U6OmRpc2NhcmRBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNT U0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojp+SW5zcGVj dG9yQ1NTQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OmRpc2Nh cmRBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6fkluc3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6On5JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50 KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OmRpc2NhcmRB Z2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaDoK KwogMjAxMS0xMi0wMSAgV2VpIENoYXJsZXMgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5jb20u Y24+CiAKICAgICAgICAgW0JsYWNrYmVycnldIFVwc3RyZWFtIEJsYWNrQmVycnkgcG9ydGluZyBv ZiBwbHVnaW4gZnJhbWV3b3JrIC0tIHBhcnQgMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckJhc2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckJhc2VBZ2VudC5oCmluZGV4IDkwMTMwMDQzNjdiZDA2YTk5YzAzY2Y5MGFiMGY3 NDM0OTRkOGVhZGIuLjgwMGY5NjczNmE4Zjg2OGI3NDIyZGU1Y2YwMDA5YjQwYTJjMTAyZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYXNlQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFzZUFnZW50LmgKQEAgLTUw LDcgKzUwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250ZW5kKCkgeyB9 CiAgICAgdmlydHVhbCB2b2lkIHJlc3RvcmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0 ZXJJbkRpc3BhdGNoZXIoSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIqKSA9IDA7Ci0gICAgdmly dHVhbCB2b2lkIGdldEFnZW50Q2FwYWJpbGl0aWVzKEluc3BlY3RvckFycmF5KikgeyB9OworICAg IHZpcnR1YWwgdm9pZCBkaXNjYXJkQWdlbnQoKSB7IH0KIAogICAgIFN0cmluZyBuYW1lKCkgeyBy ZXR1cm4gbV9uYW1lOyB9CiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggN2NjY2JiYzFlOWZlNDQ2MDEyY2ZiY2FmNzFiNzky NmUwYmI5MTI2OC4uZjUwNmE1YmZiNWE0YmQ5NTA5M2VhMzQ1MDAzYTgwMzIyODc4Y2Y0NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC0x OTgsMTAgKzE5OCw4IEBAIEluc3BlY3RvckNTU0FnZW50OjpJbnNwZWN0b3JDU1NBZ2VudChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBJCiAKIEluc3BlY3RvckNTU0Fn ZW50Ojp+SW5zcGVjdG9yQ1NTQWdlbnQoKQogeworICAgIEFTU0VSVCghbV9kb21BZ2VudCk7CiAg ICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JDU1NBZ2VudCgwKTsKLSAgICAv LyBET00gYWdlbnQgc2hvdWxkIGJlIGRlc3Ryb3llZCBhZnRlciBDU1MgYWdlbnQuCi0gICAgbV9k b21BZ2VudC0+c2V0RE9NTGlzdGVuZXIoMCk7Ci0gICAgbV9kb21BZ2VudCA9IDA7CiAgICAgcmVz ZXQoKTsKIH0KIApAQCAtMjEwLDYgKzIwOCwxMiBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50Ojpj bGVhckZyb250ZW5kKCkKICAgICBjbGVhclBzZXVkb1N0YXRlKHRydWUpOwogfQogCit2b2lkIElu c3BlY3RvckNTU0FnZW50OjpkaXNjYXJkQWdlbnQoKQoreworICAgIG1fZG9tQWdlbnQtPnNldERP TUxpc3RlbmVyKDApOworICAgIG1fZG9tQWdlbnQgPSAwOworfQorCiB2b2lkIEluc3BlY3RvckNT U0FnZW50OjpyZXNldCgpCiB7CiAgICAgbV9pZFRvSW5zcGVjdG9yU3R5bGVTaGVldC5jbGVhcigp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCA5 MThkYTZiMzJmMTRhZGYwZGFhZmViOTRkZmM0OWNjZDkxOWVlY2Q1Li43NGEwYjAyYjZmZWY2OTc3 OTUxMGZkYjgxMTA3MThhMmM2YzNjODk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ1NTQWdlbnQuaApAQCAtNjYsNiArNjYsNyBAQCBwdWJsaWM6CiAKICAgICBib29s IGZvcmNlUHNldWRvU3RhdGUoRWxlbWVudCosIENTU1NlbGVjdG9yOjpQc2V1ZG9UeXBlKTsKICAg ICB2aXJ0dWFsIHZvaWQgY2xlYXJGcm9udGVuZCgpOworICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJk QWdlbnQoKTsKICAgICB2b2lkIHJlc2V0KCk7CiAKICAgICB2b2lkIGdldENvbXB1dGVkU3R5bGVG b3JOb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgY29uc3QgUmVmUHRyPEluc3BlY3RvckFy cmF5PiogZm9yY2VkUHNldWRvQ2xhc3NlcywgUmVmUHRyPEluc3BlY3RvckFycmF5Piogc3R5bGUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CmluZGV4IDczOTIxZThkMTJmMTNiYzMzYTRlOGFkMjY1NGVlNjM2MzUwZWNiYTAuLjNkY2ZkZDNh MzhiMzBmZjQxMjY5YjJhOTJkOTE1MDZkOTQxMmNhNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE1MSw2ICsxNTEsOSBAQCBJ bnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIEluc3Bl Y3RvckNsaWVudCogaW5zcGVjdG9yQwogCiBJbnNwZWN0b3JDb250cm9sbGVyOjp+SW5zcGVjdG9y Q29udHJvbGxlcigpCiB7CisgICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0ID0gbV9hZ2VudHMu YmVnaW4oKTsgaXQgIT0gbV9hZ2VudHMuZW5kKCk7ICsraXQpCisgICAgICAgICgqaXQpLT5kaXNj YXJkQWdlbnQoKTsKKwogICAgIEFTU0VSVCghbV9pbnNwZWN0b3JDbGllbnQpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dC5jcHAKaW5kZXggNWVlZjk1MGI4NjNiNzFhYTg3YzJlMjBmNmM0ZWRkNTg2NzBiZWRhOC4uZWM3 YWJiNWQyMTRhMmExZTAwMTc1NDEyZjg2ZjEwMDY1NmI5OTM5ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcApAQCAt ODUsNyArODUsNyBAQCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpJbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydQogCiBJbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50Ojp+SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudCgpCiB7Ci0gICAgbV9kZWJ1Z2dl ckFnZW50LT5zZXRMaXN0ZW5lcigwKTsKKyAgICBBU1NFUlQoIW1fZGVidWdnZXJBZ2VudCk7CiAg ICAgQVNTRVJUKCFtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckRPTURlYnVnZ2VyQWdl bnQoKSk7CiB9CiAKQEAgLTExMSw2ICsxMTEsMTIgQEAgdm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dl ckFnZW50OjpjbGVhckZyb250ZW5kKCkKICAgICBkaXNhYmxlKCk7CiB9CiAKK0luc3BlY3RvckRP TURlYnVnZ2VyQWdlbnQ6OmRpc2NhcmRBZ2VudCgpCit7CisgICAgbV9kZWJ1Z2dlckFnZW50LT5z ZXRMaXN0ZW5lcigwKTsKKyAgICBtX2RlYnVnZ2VyQWdlbnQgPSAwOworfQorCiB2b2lkIEluc3Bl Y3RvckRPTURlYnVnZ2VyQWdlbnQ6OmRpc2NhcmRCaW5kaW5ncygpCiB7CiAgICAgbV9kb21CcmVh a3BvaW50cy5jbGVhcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01EZWJ1Z2dlckFnZW50LmgKaW5kZXggOTI2YTNiYjU3YzdkNjdiYjlhMmM2OGRkM2Iy YWY2NzJhYmNmZWNmZi4uZTEyMmU0ZmZjMmM4NDQ0MTMzYzE3OTZlNjNjNzcwYmIyYjMzMGE1MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2Vy QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdn ZXJBZ2VudC5oCkBAIC04MCw2ICs4MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhdXNlT25OYXRp dmVFdmVudElmTmVlZGVkKGNvbnN0IFN0cmluZyYgY2F0ZWdvcnlUeXBlLCBjb25zdCBTdHJpbmcm IGV2ZW50TmFtZSwgYm9vbCBzeW5jaHJvbm91cyk7CiAKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJG cm9udGVuZCgpOworICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJkQWdlbnQoKTsKIAogcHJpdmF0ZToK ICAgICBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqLCBJbnNw ZWN0b3JTdGF0ZSosIEluc3BlY3RvckRPTUFnZW50KiwgSW5zcGVjdG9yRGVidWdnZXJBZ2VudCos IEluc3BlY3RvckFnZW50Kik7Cg== 117469 2011-12-01 13:07:56 -0800 2011-12-01 22:04:06 -0800 [Patch] with the speculative fix for ews (2). bug-73582-20111202010754.patch text/plain 5724 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBiMTJkYTYyYzc5ZWE1 ODYyNWUxYjRhNTk1ZmE1NmNhYTg1YjE4Yi4uMDljZWNhOWRiOTNkOTQ5Y2QzZmVkOWRjYmFjZGMw MTFhYTc0M2M5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEyLTAxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluc3BlY3RvckNv bnRyb2xsZXIgZGVzdHJ1Y3Rpb24gb3JkZXIgbGVhZHMgdG8gdXNlLWFmdGVyLWZyZWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNTgyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQmFzZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCYXNlQWdlbnRJ bnRlcmZhY2U6OmRpc2NhcmRBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNT U0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojp+SW5zcGVj dG9yQ1NTQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OmRpc2Nh cmRBZ2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6fkluc3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6On5JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50 KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OmRpc2NhcmRB Z2VudCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaDoK KwogMjAxMS0xMi0wMSAgV2VpIENoYXJsZXMgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5jb20u Y24+CiAKICAgICAgICAgW0JsYWNrYmVycnldIFVwc3RyZWFtIEJsYWNrQmVycnkgcG9ydGluZyBv ZiBwbHVnaW4gZnJhbWV3b3JrIC0tIHBhcnQgMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckJhc2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckJhc2VBZ2VudC5oCmluZGV4IDkwMTMwMDQzNjdiZDA2YTk5YzAzY2Y5MGFiMGY3 NDM0OTRkOGVhZGIuLjgwMGY5NjczNmE4Zjg2OGI3NDIyZGU1Y2YwMDA5YjQwYTJjMTAyZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYXNlQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFzZUFnZW50LmgKQEAgLTUw LDcgKzUwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjbGVhckZyb250ZW5kKCkgeyB9 CiAgICAgdmlydHVhbCB2b2lkIHJlc3RvcmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0 ZXJJbkRpc3BhdGNoZXIoSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIqKSA9IDA7Ci0gICAgdmly dHVhbCB2b2lkIGdldEFnZW50Q2FwYWJpbGl0aWVzKEluc3BlY3RvckFycmF5KikgeyB9OworICAg IHZpcnR1YWwgdm9pZCBkaXNjYXJkQWdlbnQoKSB7IH0KIAogICAgIFN0cmluZyBuYW1lKCkgeyBy ZXR1cm4gbV9uYW1lOyB9CiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggN2NjY2JiYzFlOWZlNDQ2MDEyY2ZiY2FmNzFiNzky NmUwYmI5MTI2OC4uZjUwNmE1YmZiNWE0YmQ5NTA5M2VhMzQ1MDAzYTgwMzIyODc4Y2Y0NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC0x OTgsMTAgKzE5OCw4IEBAIEluc3BlY3RvckNTU0FnZW50OjpJbnNwZWN0b3JDU1NBZ2VudChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBJCiAKIEluc3BlY3RvckNTU0Fn ZW50Ojp+SW5zcGVjdG9yQ1NTQWdlbnQoKQogeworICAgIEFTU0VSVCghbV9kb21BZ2VudCk7CiAg ICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0b3JDU1NBZ2VudCgwKTsKLSAgICAv LyBET00gYWdlbnQgc2hvdWxkIGJlIGRlc3Ryb3llZCBhZnRlciBDU1MgYWdlbnQuCi0gICAgbV9k b21BZ2VudC0+c2V0RE9NTGlzdGVuZXIoMCk7Ci0gICAgbV9kb21BZ2VudCA9IDA7CiAgICAgcmVz ZXQoKTsKIH0KIApAQCAtMjEwLDYgKzIwOCwxMiBAQCB2b2lkIEluc3BlY3RvckNTU0FnZW50Ojpj bGVhckZyb250ZW5kKCkKICAgICBjbGVhclBzZXVkb1N0YXRlKHRydWUpOwogfQogCit2b2lkIElu c3BlY3RvckNTU0FnZW50OjpkaXNjYXJkQWdlbnQoKQoreworICAgIG1fZG9tQWdlbnQtPnNldERP TUxpc3RlbmVyKDApOworICAgIG1fZG9tQWdlbnQgPSAwOworfQorCiB2b2lkIEluc3BlY3RvckNT U0FnZW50OjpyZXNldCgpCiB7CiAgICAgbV9pZFRvSW5zcGVjdG9yU3R5bGVTaGVldC5jbGVhcigp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCA5 MThkYTZiMzJmMTRhZGYwZGFhZmViOTRkZmM0OWNjZDkxOWVlY2Q1Li43NGEwYjAyYjZmZWY2OTc3 OTUxMGZkYjgxMTA3MThhMmM2YzNjODk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ1NTQWdlbnQuaApAQCAtNjYsNiArNjYsNyBAQCBwdWJsaWM6CiAKICAgICBib29s IGZvcmNlUHNldWRvU3RhdGUoRWxlbWVudCosIENTU1NlbGVjdG9yOjpQc2V1ZG9UeXBlKTsKICAg ICB2aXJ0dWFsIHZvaWQgY2xlYXJGcm9udGVuZCgpOworICAgIHZpcnR1YWwgdm9pZCBkaXNjYXJk QWdlbnQoKTsKICAgICB2b2lkIHJlc2V0KCk7CiAKICAgICB2b2lkIGdldENvbXB1dGVkU3R5bGVG b3JOb2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgY29uc3QgUmVmUHRyPEluc3BlY3RvckFy cmF5PiogZm9yY2VkUHNldWRvQ2xhc3NlcywgUmVmUHRyPEluc3BlY3RvckFycmF5Piogc3R5bGUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CmluZGV4IDczOTIxZThkMTJmMTNiYzMzYTRlOGFkMjY1NGVlNjM2MzUwZWNiYTAuLjNkY2ZkZDNh MzhiMzBmZjQxMjY5YjJhOTJkOTE1MDZkOTQxMmNhNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE1MSw2ICsxNTEsOSBAQCBJ bnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIEluc3Bl Y3RvckNsaWVudCogaW5zcGVjdG9yQwogCiBJbnNwZWN0b3JDb250cm9sbGVyOjp+SW5zcGVjdG9y Q29udHJvbGxlcigpCiB7CisgICAgZm9yIChBZ2VudHM6Oml0ZXJhdG9yIGl0ID0gbV9hZ2VudHMu YmVnaW4oKTsgaXQgIT0gbV9hZ2VudHMuZW5kKCk7ICsraXQpCisgICAgICAgICgqaXQpLT5kaXNj YXJkQWdlbnQoKTsKKwogICAgIEFTU0VSVCghbV9pbnNwZWN0b3JDbGllbnQpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2Vu dC5jcHAKaW5kZXggNWVlZjk1MGI4NjNiNzFhYTg3YzJlMjBmNmM0ZWRkNTg2NzBiZWRhOC4uMWY5 MjY2ODA2NjFmNGE3NWIxOGY2ZWQ1M2EzZTcwN2UzYTNkOGE0MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmNwcApAQCAt ODUsNyArODUsNyBAQCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpJbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydQogCiBJbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50Ojp+SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudCgpCiB7Ci0gICAgbV9kZWJ1Z2dl ckFnZW50LT5zZXRMaXN0ZW5lcigwKTsKKyAgICBBU1NFUlQoIW1fZGVidWdnZXJBZ2VudCk7CiAg ICAgQVNTRVJUKCFtX2luc3RydW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckRPTURlYnVnZ2VyQWdl bnQoKSk7CiB9CiAKQEAgLTExMSw2ICsxMTEsMTIgQEAgdm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dl ckFnZW50OjpjbGVhckZyb250ZW5kKCkKICAgICBkaXNhYmxlKCk7CiB9CiAKK3ZvaWQgSW5zcGVj dG9yRE9NRGVidWdnZXJBZ2VudDo6ZGlzY2FyZEFnZW50KCkKK3sKKyAgICBtX2RlYnVnZ2VyQWdl bnQtPnNldExpc3RlbmVyKDApOworICAgIG1fZGVidWdnZXJBZ2VudCA9IDA7Cit9CisKIHZvaWQg SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6ZGlzY2FyZEJpbmRpbmdzKCkKIHsKICAgICBtX2Rv bUJyZWFrcG9pbnRzLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaAppbmRleCA5MjZhM2JiNTdjN2Q2N2JiOWEyYzY4 ZGQzYjJhZjY3MmFiY2ZlY2ZmLi5lMTIyZTRmZmMyYzg0NDQxMzNjMTc5NmU2M2M3NzBiYjJiMzMw YTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVi dWdnZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01E ZWJ1Z2dlckFnZW50LmgKQEAgLTgwLDYgKzgwLDcgQEAgcHVibGljOgogICAgIHZvaWQgcGF1c2VP bk5hdGl2ZUV2ZW50SWZOZWVkZWQoY29uc3QgU3RyaW5nJiBjYXRlZ29yeVR5cGUsIGNvbnN0IFN0 cmluZyYgZXZlbnROYW1lLCBib29sIHN5bmNocm9ub3VzKTsKIAogICAgIHZpcnR1YWwgdm9pZCBj bGVhckZyb250ZW5kKCk7CisgICAgdmlydHVhbCB2b2lkIGRpc2NhcmRBZ2VudCgpOwogCiBwcml2 YXRlOgogICAgIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyos IEluc3BlY3RvclN0YXRlKiwgSW5zcGVjdG9yRE9NQWdlbnQqLCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50KiwgSW5zcGVjdG9yQWdlbnQqKTsK