43780 2010-08-10 03:15:01 -0700 Web Inspector, Chromium: reloading of inspected page hits assert in InspectorController::enableDebuggerFromFrontend() 2010-08-10 05:42:58 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 caseq webkit-unassigned loislo pfeldman yurys oldest_to_newest 262591 0 caseq 2010-08-10 03:15:01 -0700 1. Open any page 2. Open inspector 3. Reload the page Inspected page renderer hits assertion in InspectorController::enableDebuggerFromFrontend(): > chrome.dll!WebCore::InspectorController::enableDebuggerFromFrontend(bool always=false) Line 1621 + 0x2b bytes C++ chrome.dll!WebCore::InspectorController::connectFrontend(const WebCore::ScriptObject & webInspector={...}) Line 490 C++ chrome.dll!WebKit::WebDevToolsAgentImpl::frontendLoaded() Line 272 + 0x34 bytes C++ chrome.dll!WebKit::WebDevToolsAgentImpl::setRuntimeFeatureEnabled(const WebKit::WebString & feature={...}, bool enabled=true) Line 315 + 0xf bytes C++ chrome.dll!DevToolsAgent::OnAttach(const std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > & runtime_features=[1]("frontend-connected")) Line 174 + 0x27 bytes C++ chrome.dll!DispatchToMethod<DevToolsAgent,void (__thiscall DevToolsAgent::*)(std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > const &),std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > >(DevToolsAgent * obj=0x01989540, void (const std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > &)* method=0x568ecab0, const Tuple1<std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > > & arg={...}) Line 499 + 0xc bytes C++ chrome.dll!IPC::MessageWithTuple<Tuple1<std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > > >::Dispatch<DevToolsAgent,void (__thiscall DevToolsAgent::*)(std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > const &)>(const IPC::Message * msg=class=176, index=0, DevToolsAgent * obj=0x01989540, void (const std::vector<std::basic_string<char,std::char_traits<char>,std::allocator<char> >,std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char> > > > &)* func=0x568ecab0) Line 1049 + 0x11 bytes C++ chrome.dll!DevToolsAgent::OnMessageReceived(const IPC::Message & message=class=176, index=0) Line 79 + 0x12 bytes C++ 262630 1 64002 yurys 2010-08-10 05:33:28 -0700 Created attachment 64002 Patch 262637 2 yurys 2010-08-10 05:42:58 -0700 Committed r65068 64002 2010-08-10 05:33:28 -0700 2010-08-10 05:35:06 -0700 Patch bug-43780-20100810163325.patch text/plain 11657 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGRmOTYzOTEwZjRjMTBiODhjNzVmYzE2NWEzMDg5YzE3ZWM3NjMxNy4uM2M3ZjY4NzAwZDMyMDY3 NmMwY2Q0MzMxZDQ4MmY4NGIwNTk3YWYxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wOC0xMCAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yLCBDaHJvbWl1bTogcmVs b2FkaW5nIG9mIGluc3BlY3RlZCBwYWdlIGhpdHMgYXNzZXJ0IGluIEluc3BlY3RvckNvbnRyb2xs ZXI6OmVuYWJsZURlYnVnZ2VyRnJvbUZyb250ZW5kKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNzgwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29k ZUdlbmVyYXRvckluc3BlY3Rvci5wbToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjplbmFi bGVEZWJ1Z2dlckZyb21Gcm9udGVuZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Omhhc0Zy b250ZW5kKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjcmVhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6SW5zcGVjdG9yRGVidWdnZXJB Z2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRQYXVz ZU9uRXhjZXB0aW9uc1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmRpZFBhcnNlU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6OmZhaWxlZFRvUGFyc2VTb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6ZGlkUGF1c2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6ZGlkQ29udGludWUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50Lmg6CisKIDIwMTAtMDgtMDkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtIGIvV2ViQ29yZS9pbnNw ZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbQppbmRleCBmNDY4NTdhYWEwOWE0MjcwYWFm MTgyMDI5MjI0YmRkYTdjNGM1MmUyLi45NGFhN2IzNDBjNTA4MzIzNjcyOTYwODk1YWEzYjZkNTQ4 OTc1ZGE5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVj dG9yLnBtCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0K QEAgLTIwNiw3ICsyMDYsNiBAQCBzdWIgR2VuZXJhdGVJbnRlcmZhY2UKICAgICAkYmFja2VuZENs YXNzTmFtZSA9ICRjbGFzc05hbWUgLiAiQmFja2VuZERpc3BhdGNoZXIiOwogICAgIG15IEBiYWNr ZW5kSGVhZDsKICAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICAke2JhY2tlbmRDbGFzc05hbWV9 KEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRyb2xsZXIpIDogbV9pbnNwZWN0b3JD b250cm9sbGVyKGluc3BlY3RvckNvbnRyb2xsZXIpIHsgfSIpOwotICAgIHB1c2goQGJhY2tlbmRI ZWFkLCAiICAgIFJlbW90ZUluc3BlY3RvckZyb250ZW5kKiBpbnNwZWN0b3JGcm9udGVuZCgpIGNv bnN0IHsgcmV0dXJuIG1faW5zcGVjdG9yQ29udHJvbGxlci0+cmVtb3RlSW5zcGVjdG9yRnJvbnRl bmQoKTsgfSIpOwogICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgIHZvaWQgcmVwb3J0UHJvdG9j b2xFcnJvcihjb25zdCBsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0 cmluZyYgZXJyb3JUZXh0KSBjb25zdDsiKTsKICAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICB2 b2lkIGRpc3BhdGNoKGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7Iik7CiAgICAgcHVzaChAYmFja2Vu ZEhlYWQsICJwcml2YXRlOiIpOwpAQCAtMzUyLDcgKzM1MSw3IEBAIHN1YiBnZW5lcmF0ZUJhY2tl bmRGdW5jdGlvbgogCiAgICAgICAgIHB1c2goQGZ1bmN0aW9uLCAiIik7CiAgICAgICAgIHB1c2go QGZ1bmN0aW9uLCAiICAgIC8vIHVzZSBJbnNwZWN0b3JGcm9udGVuZCBhcyBhIG1hcmtlciBvZiBX ZWJJbnNwZWN0b3IgYXZhaWxhYmlsaXR5Iik7Ci0gICAgICAgIHB1c2goQGZ1bmN0aW9uLCAiICAg IGlmIChtX2luc3BlY3RvckNvbnRyb2xsZXItPnJlbW90ZUluc3BlY3RvckZyb250ZW5kKCkpIHsi KTsKKyAgICAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgaWYgKG1faW5zcGVjdG9yQ29udHJvbGxl ci0+aGFzRnJvbnRlbmQoKSkgeyIpOwogICAgICAgICBwdXNoKEBmdW5jdGlvbiwgIiAgICAgICAg UmVmUHRyPEluc3BlY3RvckFycmF5PiBhcmd1bWVudHMgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRl KCk7Iik7CiAgICAgICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgICAgICBhcmd1bWVudHMtPnB1c2hT dHJpbmcoXCJwcm9jZXNzUmVzcG9uc2VcIik7Iik7CiAgICAgICAgIHB1c2goQGZ1bmN0aW9uLCAi ICAgICAgICBhcmd1bWVudHMtPnB1c2hOdW1iZXIoY2FsbElkKTsiKTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggZTFhZWZmOWNmYmFiODAyNDAxZTgzNGFm NThmMzhjZGJiMzdkOWJkMi4uOWU1NTA2N2FkZmU3OGRkNzk5MTU0N2Y4MWY2ZjA1NDhlZDBjOGI4 YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE2MjQs NyArMTYyNCw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZW5hYmxlRGVidWdnZXJGcm9t RnJvbnRlbmQoYm9vbCBhbHdheXMpCiAKICAgICBBU1NFUlQobV9pbnNwZWN0ZWRQYWdlKTsKIAot ICAgIG1fZGVidWdnZXJBZ2VudCA9IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmNyZWF0ZSh0aGlz KTsKKyAgICBtX2RlYnVnZ2VyQWdlbnQgPSBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpjcmVhdGUo dGhpcywgbV9yZW1vdGVGcm9udGVuZC5nZXQoKSk7CiAKICAgICBtX3JlbW90ZUZyb250ZW5kLT5k ZWJ1Z2dlcldhc0VuYWJsZWQoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuaAppbmRleCBlMzU2OWNjMjVhNGE4YTA3N2I3N2M3MjY0ZGQ3NGU0NTg3NGZlOWEyLi41NTI1 MmU5M2M4Y2RiOTJlNTA2NTgxNDZkZDMwNDVjMTgyYzg5NmU5IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0yMDcsNyArMjA3LDcgQEAgcHVibGljOgogCiAgICAg Y29uc3QgUmVzb3VyY2VzTWFwJiByZXNvdXJjZXMoKSBjb25zdCB7IHJldHVybiBtX3Jlc291cmNl czsgfQogICAgIEluc3BlY3RvclJlc291cmNlKiByZXNvdXJjZUZvclVSTChjb25zdCBTdHJpbmcm IHVybCk7Ci0gICAgUmVtb3RlSW5zcGVjdG9yRnJvbnRlbmQqIHJlbW90ZUluc3BlY3RvckZyb250 ZW5kKCkgeyByZXR1cm4gbV9yZW1vdGVGcm9udGVuZC5nZXQoKTsgfQorICAgIGJvb2wgaGFzRnJv bnRlbmQoKSBjb25zdCB7IHJldHVybiBtX3JlbW90ZUZyb250ZW5kOyB9CiAKICAgICB2b2lkIGRy YXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCYpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGE2MTdlNzk1NmIwODNjY2Zh YTVmZGFmNDViZTM0ODkyNjg2MzBmMTcuLmI3MGRkYmYzMDlkN2I4NTU1ODBiODNmOTE1ZmRhY2Ix ZGFlZTU2OTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu Y3BwCkBAIC00NiwxNiArNDYsMTcgQEAgc3RhdGljIFN0cmluZyBmb3JtYXRCcmVha3BvaW50SWQo Y29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgdW5zaWduZWQgbGluZU51bWJlcikKICAgICByZXR1cm4g U3RyaW5nOjpmb3JtYXQoIiVzOiVkIiwgc291cmNlSUQudXRmOCgpLmRhdGEoKSwgbGluZU51bWJl cik7CiB9CiAKLVBhc3NPd25QdHI8SW5zcGVjdG9yRGVidWdnZXJBZ2VudD4gSW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6Y3JlYXRlKEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRyb2xs ZXIpCitQYXNzT3duUHRyPEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ+IEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmNyZWF0ZShJbnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyLCBS ZW1vdGVJbnNwZWN0b3JGcm9udGVuZCogcmVtb3RlRnJvbnRlbmQpCiB7Ci0gICAgT3duUHRyPElu c3BlY3RvckRlYnVnZ2VyQWdlbnQ+IGFnZW50ID0gYWRvcHRQdHIobmV3IEluc3BlY3RvckRlYnVn Z2VyQWdlbnQoaW5zcGVjdG9yQ29udHJvbGxlcikpOworICAgIE93blB0cjxJbnNwZWN0b3JEZWJ1 Z2dlckFnZW50PiBhZ2VudCA9IGFkb3B0UHRyKG5ldyBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50KGlu c3BlY3RvckNvbnRyb2xsZXIsIHJlbW90ZUZyb250ZW5kKSk7CiAgICAgU2NyaXB0RGVidWdTZXJ2 ZXI6OnNoYXJlZCgpLmNsZWFyQnJlYWtwb2ludHMoKTsKICAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6 c2hhcmVkKCkuYWRkTGlzdGVuZXIoYWdlbnQuZ2V0KCksIGluc3BlY3RvckNvbnRyb2xsZXItPmlu c3BlY3RlZFBhZ2UoKSk7CiAgICAgcmV0dXJuIGFnZW50LnJlbGVhc2UoKTsKIH0KIAotSW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudChJbnNwZWN0b3JDb250cm9s bGVyKiBpbnNwZWN0b3JDb250cm9sbGVyKQorSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudChJbnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVy LCBSZW1vdGVJbnNwZWN0b3JGcm9udGVuZCogcmVtb3RlRnJvbnRlbmQpCiAgICAgOiBtX2luc3Bl Y3RvckNvbnRyb2xsZXIoaW5zcGVjdG9yQ29udHJvbGxlcikKKyAgICAsIG1fcmVtb3RlRnJvbnRl bmQocmVtb3RlRnJvbnRlbmQpCiAgICAgLCBtX3BhdXNlZFNjcmlwdFN0YXRlKDApCiAgICAgLCBt X2JyZWFrcG9pbnRzTG9hZGVkKGZhbHNlKQogewpAQCAtMTY2LDggKzE2Nyw3IEBAIHZvaWQgSW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6c3RlcE91dE9mRnVuY3Rpb24oKQogdm9pZCBJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50OjpzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKGxvbmcgcGF1c2VTdGF0ZSkK IHsKICAgICBTY3JpcHREZWJ1Z1NlcnZlcjo6c2hhcmVkKCkuc2V0UGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZShzdGF0aWNfY2FzdDxTY3JpcHREZWJ1Z1NlcnZlcjo6UGF1c2VPbkV4Y2VwdGlvbnNTdGF0 ZT4ocGF1c2VTdGF0ZSkpOwotICAgIGlmIChyZW1vdGVGcm9udGVuZCgpKQotICAgICAgICByZW1v dGVGcm9udGVuZCgpLT51cGRhdGVQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKFNjcmlwdERlYnVnU2Vy dmVyOjpzaGFyZWQoKS5wYXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkpOworICAgIG1fcmVtb3RlRnJv bnRlbmQtPnVwZGF0ZVBhdXNlT25FeGNlcHRpb25zU3RhdGUoU2NyaXB0RGVidWdTZXJ2ZXI6OnNo YXJlZCgpLnBhdXNlT25FeGNlcHRpb25zU3RhdGUoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRGVi dWdnZXJBZ2VudDo6Y2xlYXJGb3JQYWdlTmF2aWdhdGlvbigpCkBAIC0yNDYsNyArMjQ2LDcgQEAg dm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzYXZlQnJlYWtwb2ludHMoKQogdm9pZCBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlE LCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RMaW5lLCBT Y3JpcHRXb3JsZFR5cGUgd29ybGRUeXBlKQogewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNv bnRlbnQgdG8gdGhlIGZyb250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgcmVt b3RlRnJvbnRlbmQoKS0+cGFyc2VkU2NyaXB0U291cmNlKHNvdXJjZUlELCB1cmwsICIiLCBmaXJz dExpbmUsIHdvcmxkVHlwZSk7CisgICAgbV9yZW1vdGVGcm9udGVuZC0+cGFyc2VkU2NyaXB0U291 cmNlKHNvdXJjZUlELCB1cmwsICIiLCBmaXJzdExpbmUsIHdvcmxkVHlwZSk7CiAKICAgICBtX3Nj cmlwdElEVG9Db250ZW50LnNldChzb3VyY2VJRCwgZGF0YSk7CiAKQEAgLTI2NCw3ICsyNjQsNyBA QCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmlu ZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZwogICAgICAgICAgICAgYm9vbCBzdWNjZXNzID0gU2Ny aXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgpLnNldEJyZWFrcG9pbnQoc291cmNlSUQsIGJyZWFrcG9p bnRJdC0+c2Vjb25kLCBsaW5lTnVtYmVyLCAmYWN0dWFsTGluZU51bWJlcik7CiAgICAgICAgICAg ICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBy ZW1vdGVGcm9udGVuZCgpLT5yZXN0b3JlZEJyZWFrcG9pbnQoc291cmNlSUQsIHVybCwgYWN0dWFs TGluZU51bWJlciwgYnJlYWtwb2ludEl0LT5zZWNvbmQuZW5hYmxlZCwgYnJlYWtwb2ludEl0LT5z ZWNvbmQuY29uZGl0aW9uKTsKKyAgICAgICAgICAgIG1fcmVtb3RlRnJvbnRlbmQtPnJlc3RvcmVk QnJlYWtwb2ludChzb3VyY2VJRCwgdXJsLCBhY3R1YWxMaW5lTnVtYmVyLCBicmVha3BvaW50SXQt PnNlY29uZC5lbmFibGVkLCBicmVha3BvaW50SXQtPnNlY29uZC5jb25kaXRpb24pOwogICAgICAg ICAgICAgU3RyaW5nIGJyZWFrcG9pbnRJZCA9IGZvcm1hdEJyZWFrcG9pbnRJZChzb3VyY2VJRCwg YWN0dWFsTGluZU51bWJlcik7CiAgICAgICAgICAgICBtX2JyZWFrcG9pbnRzTWFwcGluZy5zZXQo YnJlYWtwb2ludElkLCBsaW5lTnVtYmVyKTsKICAgICAgICAgfQpAQCAtMjc0LDcgKzI3NCw3IEBA IHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nCiAKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 ZmFpbGVkVG9QYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRh LCBpbnQgZmlyc3RMaW5lLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2Fn ZSkKIHsKLSAgICByZW1vdGVGcm9udGVuZCgpLT5mYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlKHVy bCwgZGF0YSwgZmlyc3RMaW5lLCBlcnJvckxpbmUsIGVycm9yTWVzc2FnZSk7CisgICAgbV9yZW1v dGVGcm9udGVuZC0+ZmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSh1cmwsIGRhdGEsIGZpcnN0TGlu ZSwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UpOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmRpZFBhdXNlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSkKQEAgLTI4MiwxOCArMjgy LDEzIEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGF1c2UoU2NyaXB0U3RhdGUq IHNjcmlwdFN0YXRlKQogICAgIEFTU0VSVChzY3JpcHRTdGF0ZSAmJiAhbV9wYXVzZWRTY3JpcHRT dGF0ZSk7CiAgICAgbV9wYXVzZWRTY3JpcHRTdGF0ZSA9IHNjcmlwdFN0YXRlOwogICAgIFJlZlB0 cjxJbnNwZWN0b3JWYWx1ZT4gY2FsbEZyYW1lcyA9IGN1cnJlbnRDYWxsRnJhbWVzKCk7Ci0gICAg cmVtb3RlRnJvbnRlbmQoKS0+cGF1c2VkU2NyaXB0KGNhbGxGcmFtZXMuZ2V0KCkpOworICAgIG1f cmVtb3RlRnJvbnRlbmQtPnBhdXNlZFNjcmlwdChjYWxsRnJhbWVzLmdldCgpKTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRDb250aW51ZSgpCiB7CiAgICAgbV9wYXVzZWRT Y3JpcHRTdGF0ZSA9IDA7Ci0gICAgcmVtb3RlRnJvbnRlbmQoKS0+cmVzdW1lZFNjcmlwdCgpOwot fQotCi1SZW1vdGVJbnNwZWN0b3JGcm9udGVuZCogSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVt b3RlRnJvbnRlbmQoKSBjb25zdAotewotICAgIHJldHVybiBtX2luc3BlY3RvckNvbnRyb2xsZXIt PnJlbW90ZUluc3BlY3RvckZyb250ZW5kKCk7CisgICAgbV9yZW1vdGVGcm9udGVuZC0+cmVzdW1l ZFNjcmlwdCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggNmRiNjI2N2I0YzExZjNiMDJiYjdmOTgy Y2NiNWE1ZWViMjg2MzYzMy4uNTQyOGViMmJjM2JhMjU5M2QxMjQxODQ4NjNlZDExNjkwZjVhZDk2 NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaApAQCAtNDcs NyArNDcsNyBAQCBjbGFzcyBSZW1vdGVJbnNwZWN0b3JGcm9udGVuZDsKIAogY2xhc3MgSW5zcGVj dG9yRGVidWdnZXJBZ2VudCA6IHB1YmxpYyBTY3JpcHREZWJ1Z0xpc3RlbmVyLCBwdWJsaWMgTm9u Y29weWFibGUgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ+IGNyZWF0ZShJbnNwZWN0b3JDb250cm9sbGVyKik7CisgICAgc3RhdGljIFBhc3NP d25QdHI8SW5zcGVjdG9yRGVidWdnZXJBZ2VudD4gY3JlYXRlKEluc3BlY3RvckNvbnRyb2xsZXIq LCBSZW1vdGVJbnNwZWN0b3JGcm9udGVuZCopOwogICAgIHZpcnR1YWwgfkluc3BlY3RvckRlYnVn Z2VyQWdlbnQoKTsKIAogICAgIHN0YXRpYyBib29sIGlzRGVidWdnZXJBbHdheXNFbmFibGVkKCk7 CkBAIC03Myw3ICs3Myw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgU3RyaW5nIG1kNUJhc2UxNihj b25zdCBTdHJpbmcmIHN0cmluZyk7CiAKIHByaXZhdGU6Ci0gICAgSW5zcGVjdG9yRGVidWdnZXJB Z2VudChJbnNwZWN0b3JDb250cm9sbGVyKik7CisgICAgSW5zcGVjdG9yRGVidWdnZXJBZ2VudChJ bnNwZWN0b3JDb250cm9sbGVyKiwgUmVtb3RlSW5zcGVjdG9yRnJvbnRlbmQqKTsKIAogICAgIFBh c3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKQEAgLTg1LDkg Kzg1LDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUq KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKTsKIAotICAgIFJlbW90ZUluc3BlY3Rv ckZyb250ZW5kKiByZW1vdGVGcm9udGVuZCgpIGNvbnN0OwotCiAgICAgSW5zcGVjdG9yQ29udHJv bGxlciogbV9pbnNwZWN0b3JDb250cm9sbGVyOworICAgIFJlbW90ZUluc3BlY3RvckZyb250ZW5k KiBtX3JlbW90ZUZyb250ZW5kOwogICAgIFNjcmlwdFN0YXRlKiBtX3BhdXNlZFNjcmlwdFN0YXRl OwogICAgIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IG1fc291cmNlSURUb1VSTDsKICAgICBIYXNo TWFwPFN0cmluZywgU3RyaW5nPiBtX3NjcmlwdElEVG9Db250ZW50OwpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg YmNjYjQyZTYzM2Q3Yzc0ZTA1NzVlMDdkNjFlMWMyZDZiODRmYTA0My4uNjhjMTQzZTQ4MWY0YTlh YTYyOTFlMGZiOGQ2MzgwNmEzNDZkNGM4NCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAK IDIwMTAtMDgtMTAgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rv ciwgQ2hyb21pdW06IHJlbG9hZGluZyBvZiBpbnNwZWN0ZWQgcGFnZSBoaXRzIGFzc2VydCBpbiBJ bnNwZWN0b3JDb250cm9sbGVyOjplbmFibGVEZWJ1Z2dlckZyb21Gcm9udGVuZCgpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mzc4MAorCisgICAgICAg ICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2 VG9vbHNBZ2VudEltcGw6OnNldFJ1bnRpbWVGZWF0dXJlRW5hYmxlZCk6CisKKzIwMTAtMDgtMTAg IFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZp ZXdlZC4gUmVtb3ZlIHJlZmVyZW5jZXMgdG8gZGVsZXRlZCBoZWFkZXIgSW5zcGVjdG9yRnJvbnRl bmQuaAogCiAgICAgICAgICogc3JjL1dlYkRldlRvb2xzQWdlbnRJbXBsLmNwcDoKZGlmZiAtLWdp dCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGV2VG9vbHNBZ2VudEltcGwuY3BwIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50SW1wbC5jcHAKaW5kZXggMWE3NGZmNjU0OTRh NDhlZjg5N2FkYzY0YTVlOTI3ZTc1OWJlYTA4Ny4uN2E4MjVjOGU4ZjAwNDU1ZTBmNmNlNWUzOTM0 YWU0NzA5ZjNkMWJmNiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29s c0FnZW50SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEZXZUb29sc0FnZW50 SW1wbC5jcHAKQEAgLTMwNCw3ICszMDQsNyBAQCB2b2lkIFdlYkRldlRvb2xzQWdlbnRJbXBsOjpz ZXRSdW50aW1lRmVhdHVyZUVuYWJsZWQoY29uc3QgV2ViU3RyaW5nJiBmZWF0dXJlLCBibwogICAg ICAgICAgIGljLT5lbmFibGVSZXNvdXJjZVRyYWNraW5nKGZhbHNlIC8qIG5vdCBzdGlja3kgKi8s IGZhbHNlIC8qIG5vIHJlbG9hZCAqLyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICBpYy0+ZGlz YWJsZVJlc291cmNlVHJhY2tpbmcoZmFsc2UgLyogbm90IHN0aWNreSAqLyk7Ci0gICAgfSBlbHNl IGlmIChmZWF0dXJlID09IGtGcm9udGVuZENvbm5lY3RlZEZlYXR1cmVOYW1lICYmIGVuYWJsZWQp CisgICAgfSBlbHNlIGlmIChmZWF0dXJlID09IGtGcm9udGVuZENvbm5lY3RlZEZlYXR1cmVOYW1l ICYmIGVuYWJsZWQgJiYgIWluc3BlY3RvckNvbnRyb2xsZXIoKS0+aGFzRnJvbnRlbmQoKSkKICAg ICAgICAgZnJvbnRlbmRMb2FkZWQoKTsKIH0KIAo=