54344 2011-02-12 15:03:49 -0800 REGRESSION (r77834): Assertion failing in svg/custom/use-multiple-on-nested-disallowed-font.svg 2011-02-14 06:35:49 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin koivisto koivisto krit mario ossy simon.fraser zimmermann oldest_to_newest 350319 0 darin 2011-02-12 15:03:49 -0800 I am getting this assertion failure when running regression tests: ASSERTION FAILED: m_pushedStyleSelector == m_parent->document()->styleSelector() /Users/darin/Safari/OpenSource/Source/WebCore/dom/Element.cpp(90) : WebCore::StyleSelectorParentPusher::~StyleSelectorParentPusher() -> WebCore::StyleSelectorParentPusher::~StyleSelectorParentPusher() -> WebCore::Element::recalcStyle(WebCore::Node::StyleChange) -> WebCore::Element::recalcStyle(WebCore::Node::StyleChange) -> WebCore::Element::recalcStyle(WebCore::Node::StyleChange) -> WebCore::Document::recalcStyle(WebCore::Node::StyleChange) -> WebCore::Document::updateStyleIfNeeded() -> WebCore::Document::updateLayout() -> WebCore::Document::updateLayoutIgnorePendingStylesheets() -> WebCore::SVGElementInstance::invalidateAllInstancesOfElement(WebCore::SVGElement*) -> WebCore::SVGStyledElement::svgAttributeChanged(WebCore::QualifiedName const&) -> WebCore::SVGGradientElement::svgAttributeChanged(WebCore::QualifiedName const&) -> WebCore::SVGLinearGradientElement::svgAttributeChanged(WebCore::QualifiedName const&) -> WebCore::SVGElement::attributeChanged(WebCore::Attribute*, bool) -> WebCore::NamedNodeMap::addAttribute(WTF::PassRefPtr<WebCore::Attribute>) -> WebCore::Element::setAttribute(WebCore::QualifiedName const&, WTF::AtomicString const&, int&) -> WebCore::Element::setAttribute(WebCore::QualifiedName const&, WTF::AtomicString const&) -> WebCore::SVGAnimateTransformElement::resetToBaseValue(WTF::String const&) -> WebCore::SMILTimeContainer::updateAnimations(WebCore::SMILTime) -> WebCore::SMILTimeContainer::begin() -> WebCore::SVGDocumentExtensions::startAnimations() -> WebCore::Document::implicitClose() -> WebCore::FrameLoader::checkCallImplicitClose() -> WebCore::FrameLoader::checkCompleted() -> WebCore::FrameLoader::finishedParsing() -> WebCore::Document::finishedParsing() -> WebCore::HTMLTreeBuilder::finished() -> WebCore::HTMLDocumentParser::end() -> WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd() -> WebCore::HTMLDocumentParser::prepareToStopParsing() -> WebCore::HTMLDocumentParser::attemptToEnd() -> WebCore::HTMLDocumentParser::finish() I’m not sure if this is also happening on buildbots. 350327 1 krit 2011-02-12 15:21:02 -0800 *** Bug 53989 has been marked as a duplicate of this bug. *** 350329 2 darin 2011-02-12 15:23:23 -0800 We could have marked this as a duplicate in the other direction. Sorry I didn’t find the duplicate! 350332 3 krit 2011-02-12 15:35:24 -0800 (In reply to comment #2) > We could have marked this as a duplicate in the other direction. Sorry I didn’t find the duplicate! Sure, we can mark it the other way around, both bugs have the same information. But this one has 'regression' in the title. So I choose this bug as valid bug instead of renaming the other one. If you look at the bt on the other bug, you'll see that the location, where the test fails, is the same: StyleSelectorParentPusher. 350378 4 koivisto 2011-02-13 03:44:05 -0800 This is not really a regression from r77834. Rather, the assert added there exposes an SVG bug (it is recomputing the style selector in the middle of a style recalc). Strangely, I have never seen this locally. 350441 5 koivisto 2011-02-13 13:15:38 -0800 I can catch this by adding this assert: Index: Source/WebCore/dom/Document.cpp =================================================================== --- Source/WebCore/dom/Document.cpp (revision 78321) +++ Source/WebCore/dom/Document.cpp (working copy) @@ -2944,6 +2944,7 @@ void Document::recalcStyleSelector() { + ASSERT(!m_inStyleRecalc); if (!renderer() || !attached()) return; 350442 6 koivisto 2011-02-13 13:16:50 -0800 It also fails svg/custom/use-invalid-style.svg 350444 7 koivisto 2011-02-13 13:19:03 -0800 2947 ASSERT(!m_inStyleRecalc); (gdb) bt #0 0x000000010113a875 in WebCore::Document::recalcStyleSelector (this=0x1060cf000) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Document.cpp:2947 #1 0x000000010113af45 in WebCore::Document::styleSelectorChanged (this=0x1060cf000, updateFlag=WebCore::DeferRecalcStyle) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Document.cpp:2871 #2 0x0000000101b440ef in WebCore::SVGFontFaceElement::removeFromMappedElementSheet (this=0x107181720) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGFontFaceElement.cpp:351 #3 0x0000000101b4410b in WebCore::SVGFontFaceElement::removedFromDocument (this=0x107181720) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGFontFaceElement.cpp:329 #4 0x0000000100ff778d in WebCore::ContainerNode::removedFromDocument (this=0x107192260) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:743 #5 0x000000010125b357 in WebCore::Element::removedFromDocument (this=0x107192260) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:919 #6 0x0000000101ba1c09 in WebCore::SVGStyledElement::removedFromDocument (this=0x107192260) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGStyledElement.cpp:362 #7 0x0000000100ff778d in WebCore::ContainerNode::removedFromDocument (this=0x107168960) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:743 #8 0x000000010125b357 in WebCore::Element::removedFromDocument (this=0x107168960) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:919 #9 0x0000000101ba1c09 in WebCore::SVGStyledElement::removedFromDocument (this=0x107168960) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGStyledElement.cpp:362 #10 0x0000000100ff778d in WebCore::ContainerNode::removedFromDocument (this=0x10719cc10) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:743 #11 0x000000010125b357 in WebCore::Element::removedFromDocument (this=0x10719cc10) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:919 #12 0x0000000101ba1c09 in WebCore::SVGStyledElement::removedFromDocument (this=0x10719cc10) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGStyledElement.cpp:362 #13 0x0000000100ff778d in WebCore::ContainerNode::removedFromDocument (this=0x107106c20) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:743 #14 0x000000010125b357 in WebCore::Element::removedFromDocument (this=0x107106c20) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:919 #15 0x0000000101ba1c09 in WebCore::SVGStyledElement::removedFromDocument (this=0x107106c20) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGStyledElement.cpp:362 #16 0x0000000100ff778d in WebCore::ContainerNode::removedFromDocument (this=0x10716dd70) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:743 #17 0x000000010125b357 in WebCore::Element::removedFromDocument (this=0x10716dd70) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:919 #18 0x0000000101ba1c09 in WebCore::SVGStyledElement::removedFromDocument (this=0x10716dd70) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGStyledElement.cpp:362 #19 0x0000000100ffae05 in WebCore::Private::NodeRemovalDispatcher<WebCore::Node, true>::dispatch (node=0x10716dd70) at ContainerNodeAlgorithms.h:99 #20 0x0000000100ffb4b1 in WebCore::Private::addChildNodesToDeletionQueue<WebCore::Node, WebCore::ContainerNode> (head=@0x7fff5fbfd4e8, tail=@0x7fff5fbfd4e0, container=0x1071298a0) at ContainerNodeAlgorithms.h:139 #21 0x0000000100ffb50f in WebCore::removeAllChildrenInContainer<WebCore::Node, WebCore::ContainerNode> (container=0x1071298a0) at ContainerNodeAlgorithms.h:47 #22 0x0000000100ff68a3 in WebCore::ContainerNode::removeAllChildren (this=0x1071298a0) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/ContainerNode.cpp:72 #23 0x00000001019c4831 in WebCore::RenderSVGShadowTreeRootContainer::updateFromElement (this=0x107186168) at /Users/antti/webkit/OpenSource/Source/WebCore/rendering/svg/RenderSVGShadowTreeRootContainer.cpp:71 #24 0x0000000101bc4985 in WebCore::SVGUseElement::recalcStyle (this=0x1196ecad0, change=WebCore::Node::NoChange) at /Users/antti/webkit/OpenSource/Source/WebCore/svg/SVGUseElement.cpp:372 #25 0x000000010125af00 in WebCore::Element::recalcStyle (this=0x1196e9d80, change=WebCore::Node::NoChange) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:1107 #26 0x000000010125af00 in WebCore::Element::recalcStyle (this=0x119533780, change=WebCore::Node::NoChange) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:1107 #27 0x000000010125af00 in WebCore::Element::recalcStyle (this=0x105b44ee0, change=WebCore::Node::NoChange) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Element.cpp:1107 #28 0x0000000101142f6a in WebCore::Document::recalcStyle (this=0x1060cf000, change=WebCore::Node::NoChange) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Document.cpp:1520 #29 0x000000010113a17f in WebCore::Document::updateStyleIfNeeded (this=0x1060cf000) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Document.cpp:1562 #30 0x0000000101139ed1 in WebCore::Document::updateLayout (this=0x1060cf000) at /Users/antti/webkit/OpenSource/Source/WebCore/dom/Document.cpp:1589 350446 8 koivisto 2011-02-13 13:20:39 -0800 DOM mutation from recalcStyle is evil. 350580 9 82302 koivisto 2011-02-14 03:39:55 -0800 Created attachment 82302 patch Intead of recomputing, just mark style selector dirty if it is invalidated in the middle of a style recalc. 350582 10 82303 koivisto 2011-02-14 03:49:02 -0800 Created attachment 82303 more correct patch 350592 11 82303 kling 2011-02-14 04:50:34 -0800 Comment on attachment 82303 more correct patch r=me (Niko/Dirk: heads up!) 350602 12 koivisto 2011-02-14 05:13:34 -0800 http://trac.webkit.org/changeset/78468 350634 13 ossy 2011-02-14 06:35:49 -0800 *** Bug 54086 has been marked as a duplicate of this bug. *** 82302 2011-02-14 03:39:55 -0800 2011-02-14 03:49:02 -0800 patch styleselector-recalc-delay.patch text/plain 2657 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4NDYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMTQgIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04gKHI3NzgzNCk6IEFzc2VydGlvbiBmYWlsaW5n IGluIHN2Zy9jdXN0b20vdXNlLW11bHRpcGxlLW9uLW5lc3RlZC1kaXNhbGxvd2VkLWZvbnQuc3Zn CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDM0NAor ICAgICAgICAKKyAgICAgICAgSW50ZWFkIG9mIHJlY29tcHV0aW5nLCBqdXN0IG1hcmsgc3R5bGUg c2VsZWN0b3IgZGlydHkgaWYgaXQgaXMgaW52YWxpZGF0ZWQgaW4gdGhlIG1pZGRsZSBvZiBhIHN0 eWxlIHJlY2FsYy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJl Y2FsY1N0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZWNhbGNTdHlsZVNlbGVj dG9yKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKwogMjAxMS0wMi0xMyAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5z dGVpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gNzgzMjEpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzksNiAr NDc5LDcgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgSwogICAgIG1f Z290b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkID0gZmFsc2U7CiAgCiAgICAgbV9k aWRDYWxjdWxhdGVTdHlsZVNlbGVjdG9yID0gZmFsc2U7CisgICAgbV9oYXNEaXJ0eVN0eWxlU2Vs ZWN0b3IgPSBmYWxzZTsKICAgICBtX3BlbmRpbmdTdHlsZXNoZWV0cyA9IDA7CiAgICAgbV9pZ25v cmVQZW5kaW5nU3R5bGVzaGVldHMgPSBmYWxzZTsKICAgICBtX2hhc05vZGVzV2l0aFBsYWNlaG9s ZGVyU3R5bGUgPSBmYWxzZTsKQEAgLTE0ODksNiArMTQ5MCwxMSBAQCB2b2lkIERvY3VtZW50Ojpy ZWNhbGNTdHlsZShTdHlsZUNoYW5nZSBjCiAgICAgCiAgICAgaWYgKG1faW5TdHlsZVJlY2FsYykK ICAgICAgICAgcmV0dXJuOyAvLyBHdWFyZCBhZ2FpbnN0IHJlLWVudHJhbmN5LiAtZHdoCisgICAg CisgICAgaWYgKG1faGFzRGlydHlTdHlsZVNlbGVjdG9yKSB7CisgICAgICAgIG1fc3R5bGVTZWxl Y3Rvci5jbGVhcigpOworICAgICAgICBtX2hhc0RpcnR5U3R5bGVTZWxlY3RvciA9IGZhbHNlOwor ICAgIH0KIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNhbGN1bGF0ZVN0eWxlKHRoaXMpOwogCkBAIC0y OTQ0LDYgKzI5NTAsMTMgQEAgdm9pZCBEb2N1bWVudDo6cmVtb3ZlU3R5bGVTaGVldENhbmRpZGF0 ZQogCiB2b2lkIERvY3VtZW50OjpyZWNhbGNTdHlsZVNlbGVjdG9yKCkKIHsKKyAgICBpZiAobV9p blN0eWxlUmVjYWxjKSB7CisgICAgICAgIC8vIFNWRyA8dXNlPiBlbGVtZW50IG1heSBtYW5hZ2Ug dG8gaW52YWxpZGF0ZSBzdHlsZSBzZWxlY3RvciBpbiB0aGUgbWlkZGxlIG9mIGEgc3R5bGUgcmVj YWxjLgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTQzNDQKKyAgICAgICAgbV9oYXNEaXJ0eVN0eWxlU2VsZWN0b3IgPSB0cnVlOworICAgICAgICBz Y2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAg aWYgKCFyZW5kZXJlcigpIHx8ICFhdHRhY2hlZCgpKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiA3ODMyMikKKysrIFNvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTQ3LDYgKzExNDcsNyBAQCBwcml2YXRl OgogCiAgICAgT3duUHRyPENTU1N0eWxlU2VsZWN0b3I+IG1fc3R5bGVTZWxlY3RvcjsKICAgICBi b29sIG1fZGlkQ2FsY3VsYXRlU3R5bGVTZWxlY3RvcjsKKyAgICBib29sIG1faGFzRGlydHlTdHls ZVNlbGVjdG9yOwogCiAgICAgRnJhbWUqIG1fZnJhbWU7CiAgICAgT3duUHRyPENhY2hlZFJlc291 cmNlTG9hZGVyPiBtX2NhY2hlZFJlc291cmNlTG9hZGVyOwo= 82303 2011-02-14 03:49:02 -0800 2011-02-14 04:50:34 -0800 more correct patch styleselector-recalc-delay-2.patch text/plain 2838 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4NDYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMTQgIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04gKHI3NzgzNCk6IEFzc2VydGlvbiBmYWlsaW5n IGluIHN2Zy9jdXN0b20vdXNlLW11bHRpcGxlLW9uLW5lc3RlZC1kaXNhbGxvd2VkLWZvbnQuc3Zn CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDM0NAor ICAgICAgICAKKyAgICAgICAgSW50ZWFkIG9mIHJlY29tcHV0aW5nLCBqdXN0IG1hcmsgc3R5bGUg c2VsZWN0b3IgZGlydHkgaWYgaXQgaXMgaW52YWxpZGF0ZWQgaW4gdGhlIG1pZGRsZSBvZiBhIHN0 eWxlIHJlY2FsYy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJl Y2FsY1N0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZWNhbGNTdHlsZVNlbGVj dG9yKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKwogMjAxMS0wMi0xMyAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5z dGVpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gNzgzMjEpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzksNiAr NDc5LDcgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFtZSwgY29uc3QgSwogICAgIG1f Z290b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkID0gZmFsc2U7CiAgCiAgICAgbV9k aWRDYWxjdWxhdGVTdHlsZVNlbGVjdG9yID0gZmFsc2U7CisgICAgbV9oYXNEaXJ0eVN0eWxlU2Vs ZWN0b3IgPSBmYWxzZTsKICAgICBtX3BlbmRpbmdTdHlsZXNoZWV0cyA9IDA7CiAgICAgbV9pZ25v cmVQZW5kaW5nU3R5bGVzaGVldHMgPSBmYWxzZTsKICAgICBtX2hhc05vZGVzV2l0aFBsYWNlaG9s ZGVyU3R5bGUgPSBmYWxzZTsKQEAgLTE0ODksNiArMTQ5MCw5IEBAIHZvaWQgRG9jdW1lbnQ6OnJl Y2FsY1N0eWxlKFN0eWxlQ2hhbmdlIGMKICAgICAKICAgICBpZiAobV9pblN0eWxlUmVjYWxjKQog ICAgICAgICByZXR1cm47IC8vIEd1YXJkIGFnYWluc3QgcmUtZW50cmFuY3kuIC1kd2gKKyAgICAK KyAgICBpZiAobV9oYXNEaXJ0eVN0eWxlU2VsZWN0b3IpCisgICAgICAgIHJlY2FsY1N0eWxlU2Vs ZWN0b3IoKTsKIAogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNhbGN1bGF0ZVN0eWxlKHRoaXMpOwogCkBA IC0yOTQ0LDYgKzI5NDgsMTMgQEAgdm9pZCBEb2N1bWVudDo6cmVtb3ZlU3R5bGVTaGVldENhbmRp ZGF0ZQogCiB2b2lkIERvY3VtZW50OjpyZWNhbGNTdHlsZVNlbGVjdG9yKCkKIHsKKyAgICBpZiAo bV9pblN0eWxlUmVjYWxjKSB7CisgICAgICAgIC8vIFNWRyA8dXNlPiBlbGVtZW50IG1heSBtYW5h Z2UgdG8gaW52YWxpZGF0ZSBzdHlsZSBzZWxlY3RvciBpbiB0aGUgbWlkZGxlIG9mIGEgc3R5bGUg cmVjYWxjLgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTQzNDQKKyAgICAgICAgbV9oYXNEaXJ0eVN0eWxlU2VsZWN0b3IgPSB0cnVlOworICAgICAg ICBzY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAg ICAgaWYgKCFyZW5kZXJlcigpIHx8ICFhdHRhY2hlZCgpKQogICAgICAgICByZXR1cm47CiAKQEAg LTMwNDYsNiArMzA1Nyw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlY2FsY1N0eWxlU2VsZWN0b3IoKQog CiAgICAgbV9zdHlsZVNlbGVjdG9yLmNsZWFyKCk7CiAgICAgbV9kaWRDYWxjdWxhdGVTdHlsZVNl bGVjdG9yID0gdHJ1ZTsKKyAgICBtX2hhc0RpcnR5U3R5bGVTZWxlY3RvciA9IGZhbHNlOwogfQog CiB2b2lkIERvY3VtZW50OjpzZXRIb3Zlck5vZGUoUGFzc1JlZlB0cjxOb2RlPiBuZXdIb3Zlck5v ZGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24gNzgzMjIpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTE0Nyw2ICsxMTQ3LDcg QEAgcHJpdmF0ZToKIAogICAgIE93blB0cjxDU1NTdHlsZVNlbGVjdG9yPiBtX3N0eWxlU2VsZWN0 b3I7CiAgICAgYm9vbCBtX2RpZENhbGN1bGF0ZVN0eWxlU2VsZWN0b3I7CisgICAgYm9vbCBtX2hh c0RpcnR5U3R5bGVTZWxlY3RvcjsKIAogICAgIEZyYW1lKiBtX2ZyYW1lOwogICAgIE93blB0cjxD YWNoZWRSZXNvdXJjZUxvYWRlcj4gbV9jYWNoZWRSZXNvdXJjZUxvYWRlcjsK