19037 2008-05-13 16:31:27 -0700 Crash in WebCore::currentCallFrame when clicking Step Out 2008-05-14 09:00:42 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED http://webkit.org/demos/drosera HasReduction, InRadar P2 Normal --- 1 aroben timothy mrowe timothy oldest_to_newest 80303 0 aroben 2008-05-13 16:31:27 -0700 I'm seeing a crash in WebCore::currentCallFrame when clicking the Step Out button. Steps to reproduce: 1. Go to http://webkit.org/demos/drosera 2. Open and attach the Inspector's debugger 3. Put a breakpoint in the rot13 function 4. Click the button labelled "Nested Functions" 5. Click Step Out twice InspectorController::currentCallFrame seems to be returning 0. > WebKit_debug.dll!WebCore::JavaScriptCallFrame::isValid() Line 43 + 0x13 bytes C++ WebKit_debug.dll!WebCore::currentCallFrame(const OpaqueJSContext * ctx=0x0012ed14, OpaqueJSValue * __formal=0x087321c0, OpaqueJSValue * thisObject=0x08720d80, OpaqueJSValue * __formal=0x087321c0, OpaqueJSValue * __formal=0x087321c0, OpaqueJSValue * __formal=0x087321c0) Line 831 + 0x8 bytes C++ WebKit_debug.dll!KJS::JSCallbackFunction::callAsFunction(KJS::ExecState * exec=0x0012ed14, KJS::JSObject * thisObj=0x08720d80, const KJS::List & args={...}) Line 65 + 0x35 bytes C++ WebKit_debug.dll!KJS::JSObject::call(KJS::ExecState * exec=0x0012ed14, KJS::JSObject * thisObj=0x08720d80, const KJS::List & args={...}) Line 99 + 0x1b bytes C++ WebKit_debug.dll!KJS::FunctionCallDotNode::inlineEvaluate(KJS::ExecState * exec=0x0012ed14) Line 1495 + 0x14 bytes C++ WebKit_debug.dll!KJS::FunctionCallDotNode::evaluate(KJS::ExecState * exec=0x0012ed14) Line 1501 C++ WebKit_debug.dll!KJS::AssignLocalVarNode::evaluate(KJS::ExecState * exec=0x0012ed14) Line 3554 + 0x21 bytes C++ WebKit_debug.dll!KJS::VarStatementNode::execute(KJS::ExecState * exec=0x0012ed14) Line 4009 + 0x21 bytes C++ WebKit_debug.dll!KJS::statementListExecute(WTF::Vector<WTF::RefPtr<KJS::StatementNode>,0> & statements={...}, KJS::ExecState * exec=0x0012ed14) Line 3946 + 0x29 bytes C++ WebKit_debug.dll!KJS::BlockNode::execute(KJS::ExecState * exec=0x0012ed14) Line 3971 + 0x10 bytes C++ WebKit_debug.dll!KJS::FunctionBodyNode::execute(KJS::ExecState * exec=0x0012ed14) Line 4891 C++ WebKit_debug.dll!KJS::FunctionImp::callAsFunction(KJS::ExecState * exec=0x0012eec8, KJS::JSObject * thisObj=0x0874e460, const KJS::List & args={...}) Line 78 + 0x21 bytes C++ WebKit_debug.dll!KJS::JSObject::call(KJS::ExecState * exec=0x0012eec8, KJS::JSObject * thisObj=0x0874e460, const KJS::List & args={...}) Line 99 + 0x1b bytes C++ WebKit_debug.dll!KJS::FunctionCallDotNode::inlineEvaluate(KJS::ExecState * exec=0x0012eec8) Line 1495 + 0x14 bytes C++ WebKit_debug.dll!KJS::FunctionCallDotNode::evaluate(KJS::ExecState * exec=0x0012eec8) Line 1501 C++ WebKit_debug.dll!KJS::ExprStatementNode::execute(KJS::ExecState * exec=0x0012eec8) Line 3993 + 0x21 bytes C++ WebKit_debug.dll!KJS::statementListExecute(WTF::Vector<WTF::RefPtr<KJS::StatementNode>,0> & statements={...}, KJS::ExecState * exec=0x0012eec8) Line 3946 + 0x29 bytes C++ WebKit_debug.dll!KJS::BlockNode::execute(KJS::ExecState * exec=0x0012eec8) Line 3971 + 0x10 bytes C++ WebKit_debug.dll!KJS::FunctionBodyNode::execute(KJS::ExecState * exec=0x0012eec8) Line 4891 C++ WebKit_debug.dll!KJS::FunctionImp::callAsFunction(KJS::ExecState * exec=0x077822f8, KJS::JSObject * thisObj=0x071e3660, const KJS::List & args={...}) Line 78 + 0x21 bytes C++ WebKit_debug.dll!KJS::JSObject::call(KJS::ExecState * exec=0x077822f8, KJS::JSObject * thisObj=0x071e3660, const KJS::List & args={...}) Line 99 + 0x1b bytes C++ WebKit_debug.dll!JSObjectCallAsFunction(const OpaqueJSContext * ctx=0x077822f8, OpaqueJSValue * object=0x071e4160, OpaqueJSValue * thisObject=0x071e3660, unsigned int argumentCount=0, const OpaqueJSValue * const * arguments=0x00000000, const OpaqueJSValue * * exception=0x0012f018) Line 288 + 0x14 bytes C++ WebKit_debug.dll!WebCore::InspectorController::callFunction(const OpaqueJSContext * context=0x077822f8, OpaqueJSValue * thisObject=0x071e3660, const char * functionName=0x017f9570, unsigned int argumentCount=0, const OpaqueJSValue * const * arguments=0x00000000, const OpaqueJSValue * & exception=0x00000000) Line 135 + 0x1d bytes C++ WebKit_debug.dll!WebCore::InspectorController::didPause() Line 2253 C++ WebKit_debug.dll!WebCore::dispatchFunctionToListeners(const WTF::HashSet<WebCore::JavaScriptDebugListener *,WTF::PtrHash<WebCore::JavaScriptDebugListener *>,WTF::HashTraits<WebCore::JavaScriptDebugListener *> > & listeners={...}, void (void)* callback=0x00f76300) Line 305 + 0x13 bytes C++ WebKit_debug.dll!WebCore::JavaScriptDebugServer::dispatchFunctionToListeners(void (void)* callback=0x00f76300, KJS::ExecState * exec=0x0012f104) Line 324 + 0xd bytes C++ WebKit_debug.dll!WebCore::JavaScriptDebugServer::pauseIfNeeded(KJS::ExecState * exec=0x0012f104, int sourceID=45, int lineNumber=53) Line 412 C++ WebKit_debug.dll!WebCore::JavaScriptDebugServer::returnEvent(KJS::ExecState * exec=0x0012f104, int sourceID=45, int lineNumber=53, KJS::JSObject * __formal=0x08738c00) Line 457 C++ WebKit_debug.dll!KJS::FunctionBodyNodeWithDebuggerHooks::execute(KJS::ExecState * exec=0x0012f104) Line 4912 + 0x2e bytes C++ WebKit_debug.dll!KJS::FunctionImp::callAsFunction(KJS::ExecState * exec=0x05224560, KJS::JSObject * thisObj=0x08738b00, const KJS::List & args={...}) Line 78 + 0x21 bytes C++ WebKit_debug.dll!KJS::JSObject::call(KJS::ExecState * exec=0x05224560, KJS::JSObject * thisObj=0x08738b00, const KJS::List & args={...}) Line 99 + 0x1b bytes C++ WebKit_debug.dll!WebCore::JSAbstractEventListener::handleEvent(WebCore::Event * ele=0x083395b0, bool isWindowEvent=false) Line 100 + 0x14 bytes C++ WebKit_debug.dll!WebCore::EventTarget::handleLocalEvents(WebCore::EventTargetNode * referenceNode=0x07e282a0, WebCore::Event * evt=0x083395b0, bool useCapture=false) Line 314 + 0x2e bytes C++ WebKit_debug.dll!WebCore::EventTargetNode::handleLocalEvents(WebCore::Event * evt=0x083395b0, bool useCapture=false) Line 106 C++ WebKit_debug.dll!WebCore::EventTarget::dispatchGenericEvent(WebCore::EventTargetNode * referenceNode=0x07e282a0, WTF::PassRefPtr<WebCore::Event> e={...}, int & __formal=0, bool tempEvent=true) Line 212 + 0x1d bytes C++ WebKit_debug.dll!WebCore::EventTargetNode::dispatchEvent(WTF::PassRefPtr<WebCore::Event> e={...}, int & ec=0, bool tempEvent=true) Line 121 + 0x1e bytes C++ WebKit_debug.dll!WebCore::EventTargetNode::dispatchMouseEvent(const WebCore::AtomicString & eventType={...}, int button=0, int detail=1, int pageX=419, int pageY=287, int screenX=990, int screenY=426, bool ctrlKey=false, bool altKey=false, bool shiftKey=false, bool metaKey=false, bool isSimulated=false, WebCore::Node * relatedTargetArg=0x00000000, WTF::PassRefPtr<WebCore::Event> underlyingEvent={...}) Line 297 C++ WebKit_debug.dll!WebCore::EventTargetNode::dispatchMouseEvent(const WebCore::PlatformMouseEvent & event={...}, const WebCore::AtomicString & eventType={...}, int detail=1, WebCore::Node * relatedTarget=0x00000000) Line 215 C++ WebKit_debug.dll!WebCore::EventHandler::dispatchMouseEvent(const WebCore::AtomicString & eventType={...}, WebCore::Node * targetNode=0x07e28538, bool cancelable=true, int clickCount=1, const WebCore::PlatformMouseEvent & mouseEvent={...}, bool setUnder=true) Line 1276 + 0x29 bytes C++ WebKit_debug.dll!WebCore::EventHandler::handleMouseReleaseEvent(const WebCore::PlatformMouseEvent & mouseEvent={...}) Line 1098 + 0x28 bytes C++ WebKit_debug.dll!WebView::handleMouseEvent(unsigned int message=514, unsigned int wParam=0, long lParam=18809251) Line 1242 C++ WebKit_debug.dll!WebViewWndProc(HWND__ * hWnd=0x000d063e, unsigned int message=514, unsigned int wParam=0, long lParam=18809251) Line 1671 + 0x14 bytes C++ 80305 1 mrowe 2008-05-13 16:36:13 -0700 <rdar://problem/5933442> 80315 2 21118 timothy 2008-05-13 18:33:35 -0700 Created attachment 21118 Proposed patch 80317 3 21118 mitz 2008-05-13 18:39:42 -0700 Comment on attachment 21118 Proposed patch r=me. please add the bug URL to the change log. 80318 4 timothy 2008-05-13 18:47:06 -0700 Landed in r33425. 80352 5 aroben 2008-05-14 09:00:42 -0700 (In reply to comment #4) > Landed in r33425. Can you add a manual test to WebCore/manual-tests/inspector as well? 21118 2008-05-13 18:33:35 -0700 2008-05-13 18:39:42 -0700 Proposed patch 0001-Fixes-a-crash-when-stepping-out-in-the-Inspector-s-d.patch text/plain 5580 timothy RnJvbSBmOWRiOTQ3MTQwODQwNmVmYjZmMDk3MjA5MDNjNjM4NmVlNzMyNWNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDEzIE1heSAyMDA4IDE3OjI2OjU1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gRml4 ZXMgYSBjcmFzaCB3aGVuIHN0ZXBwaW5nIG91dCBpbiB0aGUgSW5zcGVjdG9yJ3MgZGVidWdnZXIu CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogcGFnZS9JbnNwZWN0b3JDb250cm9sbGVy LmNwcDoKKFdlYkNvcmU6OmN1cnJlbnRDYWxsRnJhbWUpOiBBZGRzIGEgbnVsbCBjaGVjayBvZiBj dXJyZW50Q2FsbEZyYW1lLApzaW5jZSBpdCBjYW4gYmUgbnVsbC4gQWxzbyByZXR1cm5zIEpTTnVs bCB0byBiZXR0ZXIgc2lnbmlmeSB0aGlzLgoqIHBhZ2UvaW5zcGVjdG9yL1NjcmlwdHNQYW5lbC5q czogVXBkYXRlcyB0aGUgZGVidWdnZXIgaW50ZXJmYWNlCndoZW4gc3RlcHBpbmcgc28gdGhlIGN1 cnJlbnRDYWxsRnJhbWUgaXNuJ3QgYWNjZXNzZWQgd2hlbiBub3QgcGF1c2VkLgpBZGRzIGEgX2Ns ZWFySW50ZXJmYWNlIGZ1bmN0aW9uIHRvIHJlbW92ZSBkdXBsaWNhdGUgY29kZS4KLS0tCiBXZWJD b3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKysKIFdl YkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCAgIHwgICAgNCArLQogV2ViQ29yZS9w YWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanMgfCAgIDM2ICsrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBhZmI5YTUyLi4xZTEzNTIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDA4LTA1LTEzICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAorICAgICAgICBGaXhlcyBhIGNyYXNo IHdoZW4gc3RlcHBpbmcgb3V0IGluIHRoZSBJbnNwZWN0b3IncyBkZWJ1Z2dlci4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvSW5zcGVjdG9y Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjdXJyZW50Q2FsbEZyYW1lKTogQWRk cyBhIG51bGwgY2hlY2sgb2YgY3VycmVudENhbGxGcmFtZSwKKyAgICAgICAgc2luY2UgaXQgY2Fu IGJlIG51bGwuIEFsc28gcmV0dXJucyBKU051bGwgdG8gYmV0dGVyIHNpZ25pZnkgdGhpcy4KKyAg ICAgICAgKiBwYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanM6IFVwZGF0ZXMgdGhlIGRlYnVn Z2VyIGludGVyZmFjZQorICAgICAgICB3aGVuIHN0ZXBwaW5nIHNvIHRoZSBjdXJyZW50Q2FsbEZy YW1lIGlzbid0IGFjY2Vzc2VkIHdoZW4gbm90IHBhdXNlZC4KKyAgICAgICAgQWRkcyBhIF9jbGVh ckludGVyZmFjZSBmdW5jdGlvbiB0byByZW1vdmUgZHVwbGljYXRlIGNvZGUuCisKKzIwMDgtMDUt MTMgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIEFkZHMg YW4gb3ZlcmxheSB3aW5kb3cgdGhhdCBjb3ZlcnMgdGhlIHNjcmlwdHMgcGFuZWwgYW5kCiAgICAg ICAgIGluZm9ybXMgdGhlIHVzZXIgdGhhdCB0aGV5IG5lZWQgdG8gYXR0YWNoIHRoZSBkZWJ1Z2dl ci4KICAgICAgICAgUHJvdmlkZXMgYW4gIkF0dGFjaCBEZWJ1Z2dlciIgYnV0dG9uIGJlbG93IHRo ZSBpbmZvIHRleHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAgYi9XZWJDb3JlL3BhZ2UvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggNTc5Mzc2 OC4uMjU2ZGRjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCisrKyBiL1dlYkNvcmUvcGFnZS9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtODI4LDgg KzgyOCw4IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGN1cnJlbnRDYWxsRnJhbWUoSlNDb250ZXh0UmVm IGN0eCwgSlNPYmplY3RSZWYgLypmdW5jdGlvbiovLCBKCiAgICAgICAgIHJldHVybiBKU1ZhbHVl TWFrZVVuZGVmaW5lZChjdHgpOwogCiAgICAgSmF2YVNjcmlwdENhbGxGcmFtZSogY2FsbEZyYW1l ID0gY29udHJvbGxlci0+Y3VycmVudENhbGxGcmFtZSgpOwotICAgIGlmICghY2FsbEZyYW1lLT5p c1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjdHgpOworICAg IGlmICghY2FsbEZyYW1lIHx8ICFjYWxsRnJhbWUtPmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJu IEpTVmFsdWVNYWtlTnVsbChjdHgpOwogCiAgICAgRXhlY1N0YXRlKiBnbG9iYWxFeGVjID0gY2Fs bEZyYW1lLT5leGVjU3RhdGUoKS0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCk7 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU2NyaXB0c1BhbmVsLmpzIGIv V2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanMKaW5kZXggZDhmZjFmYi4uOWIy MjY5YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanMK KysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TY3JpcHRzUGFuZWwuanMKQEAgLTI4OCwxOCAr Mjg4LDEzIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsK ICAgICAgICAgdGhpcy52aXNpYmxlVmlldyA9IG51bGw7CiAKLSAgICAgICAgdGhpcy5fY2xlYXJD dXJyZW50RXhlY3V0aW9uTGluZSgpOwotCiAgICAgICAgIGlmICghSW5zcGVjdG9yQ29udHJvbGxl ci5kZWJ1Z2dlckF0dGFjaGVkKCkpIHsKICAgICAgICAgICAgIHRoaXMuX3BhdXNlZCA9IGZhbHNl OwogICAgICAgICAgICAgdGhpcy5fd2FpdGluZ1RvUGF1c2UgPSBmYWxzZTsKICAgICAgICAgICAg IHRoaXMuX3N0ZXBwaW5nID0gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLnNpZGVi YXJQYW5lcy5jYWxsc3RhY2sudXBkYXRlKG51bGwpOwotICAgICAgICB0aGlzLnNpZGViYXJQYW5l cy5zY29wZWNoYWluLnVwZGF0ZShudWxsKTsKLQotICAgICAgICB0aGlzLl91cGRhdGVEZWJ1Z2dl ckJ1dHRvbnMoKTsKKyAgICAgICAgdGhpcy5fY2xlYXJJbnRlcmZhY2UoKTsKIAogICAgICAgICB0 aGlzLmZpbGVzU2VsZWN0RWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLmZ1 bmN0aW9uc1NlbGVjdEVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTU2NCwxMiArNTU5LDIz IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAg ICAgfSwKIAorICAgIF9jbGVhckludGVyZmFjZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg dGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnVwZGF0ZShudWxsKTsKKyAgICAgICAgdGhpcy5z aWRlYmFyUGFuZXMuc2NvcGVjaGFpbi51cGRhdGUobnVsbCk7CisKKyAgICAgICAgdGhpcy5fY2xl YXJDdXJyZW50RXhlY3V0aW9uTGluZSgpOworICAgICAgICB0aGlzLl91cGRhdGVEZWJ1Z2dlckJ1 dHRvbnMoKTsKKyAgICB9LAorCiAgICAgX3RvZ2dsZURlYnVnZ2luZzogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgdGhpcy5fcGF1c2VkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3dhaXRpbmdU b1BhdXNlID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3N0ZXBwaW5nID0gZmFsc2U7CiAKKyAgICAg ICAgdGhpcy5fY2xlYXJJbnRlcmZhY2UoKTsKKwogICAgICAgICBpZiAoSW5zcGVjdG9yQ29udHJv bGxlci5kZWJ1Z2dlckF0dGFjaGVkKCkpIHsKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLmF0dGFjaE92ZXJsYXlFbGVtZW50KTsKICAgICAgICAgICAgIEluc3BlY3Rv ckNvbnRyb2xsZXIuc3RvcERlYnVnZ2luZygpOwpAQCAtNTc3LDEyICs1ODMsNiBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuYXR0YWNo T3ZlcmxheUVsZW1lbnQucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlzLmF0dGFjaE92ZXJsYXlF bGVtZW50KTsKICAgICAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIuc3RhcnREZWJ1Z2dpbmdB bmRSZWxvYWRJbnNwZWN0ZWRQYWdlKCk7CiAgICAgICAgIH0KLQotICAgICAgICB0aGlzLnNpZGVi YXJQYW5lcy5jYWxsc3RhY2sudXBkYXRlKG51bGwpOwotICAgICAgICB0aGlzLnNpZGViYXJQYW5l cy5zY29wZWNoYWluLnVwZGF0ZShudWxsKTsKLQotICAgICAgICB0aGlzLl9jbGVhckN1cnJlbnRF eGVjdXRpb25MaW5lKCk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZURlYnVnZ2VyQnV0dG9ucygpOwog ICAgIH0sCiAKICAgICBfdG9nZ2xlUGF1c2U6IGZ1bmN0aW9uKCkKQEAgLTU5NywxMSArNTk3LDcg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBJ bnNwZWN0b3JDb250cm9sbGVyLnBhdXNlSW5EZWJ1Z2dlcigpOwogICAgICAgICB9CiAKLSAgICAg ICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnVwZGF0ZShudWxsKTsKLSAgICAgICAgdGhp cy5zaWRlYmFyUGFuZXMuc2NvcGVjaGFpbi51cGRhdGUobnVsbCk7Ci0KLSAgICAgICAgdGhpcy5f Y2xlYXJDdXJyZW50RXhlY3V0aW9uTGluZSgpOwotICAgICAgICB0aGlzLl91cGRhdGVEZWJ1Z2dl ckJ1dHRvbnMoKTsKKyAgICAgICAgdGhpcy5fY2xlYXJJbnRlcmZhY2UoKTsKICAgICB9LAogCiAg ICAgX3N0ZXBPdmVyQ2xpY2tlZDogZnVuY3Rpb24oKQpAQCAtNjA5LDYgKzYwNSw4IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9wYXVzZWQg PSBmYWxzZTsKICAgICAgICAgdGhpcy5fc3RlcHBpbmcgPSB0cnVlOwogCisgICAgICAgIHRoaXMu X2NsZWFySW50ZXJmYWNlKCk7CisKICAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlci5zdGVwT3Zl clN0YXRlbWVudEluRGVidWdnZXIoKTsKICAgICB9LAogCkBAIC02MTcsNiArNjE1LDggQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3BhdXNl ZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9zdGVwcGluZyA9IHRydWU7CiAKKyAgICAgICAgdGhp cy5fY2xlYXJJbnRlcmZhY2UoKTsKKwogICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnN0ZXBJ bnRvU3RhdGVtZW50SW5EZWJ1Z2dlcigpOwogICAgIH0sCiAKQEAgLTYyNSw2ICs2MjUsOCBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcGF1 c2VkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3N0ZXBwaW5nID0gdHJ1ZTsKIAorICAgICAgICB0 aGlzLl9jbGVhckludGVyZmFjZSgpOworCiAgICAgICAgIEluc3BlY3RvckNvbnRyb2xsZXIuc3Rl cE91dE9mRnVuY3Rpb25JbkRlYnVnZ2VyKCk7CiAgICAgfQogfQotLSAKMS41LjQuNAoK