18585 2008-04-18 10:08:03 -0700 Frame::ownerRenderer() is likely causing strange crashes 2008-04-18 15:03:32 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P1 Normal --- 1 eric eric oldest_to_newest 78121 0 eric 2008-04-18 10:08:03 -0700 I was cleaning up Frame yesterday and added a few more ASSERTS. One in ownerRenderer: RenderPart* Frame::ownerRenderer() const { HTMLFrameOwnerElement* ownerElement = d->m_ownerElement; if (!ownerElement) return 0; RenderObject* object = ownerElement->renderer(); if (!object) return 0; ASSERT(object->isRenderPart()); return static_cast<RenderPart*>(object); } This ASSERT fails with FOUR layout tests. Yes, I was surprised too. I expect that this could be causing all sorts of wacky crashes in real Safari. I'm not sure why it's hitting these ASSERTs yet. I'm also not sure if simply returning 0 is the right thing. Why would a frame still think an element was owning it which wasn't? 78123 1 20670 eric 2008-04-18 10:18:56 -0700 Created attachment 20670 cleanup patch which fixes layout issue and shows this crash! I could mark this patch for review, since part of it fixes an issue where we would not be properly adjusting the view size when things change during relayout... I doubt it's seen very often. But I won't yet since the ASSERT would cause 4 layout test failures. This was based on the Frame cleanup patch I posted yesterday as part of bug 18556 78124 2 eric 2008-04-18 10:32:52 -0700 The for cases which supposedly caused crashes: Tests that caused the DumpRenderTree tool to crash: fast/css/acid2 stderr fast/table/giantRowspan2 stderr http/tests/misc/acid2 stderr http/tests/navigation/fallback-anchor-reload stderr I think fast/table/giantRowspan was bogus. But http/tests/navigation/fallback-anchor-reload crashes reliably. 78126 3 eric 2008-04-18 10:33:26 -0700 ASSERTION FAILED: object->isRenderPart() (/Users/eseidel/Projects/WebKit/WebCore/page/Frame.cpp:1191 WebCore::RenderPart* WebCore::Frame::ownerRenderer() const) Is the output, btw. Exactly what was expected, the ASSERT is failing. 78129 4 eric 2008-04-18 10:44:38 -0700 I think this is caused by <object> elements not disassociating themselves with the frames that they created when they decide to render fallback content (or any other content). I imagine if you were to change an <object> from pointing at an .html file to pointing at a .png, it might crash in a similar manner. It looks like there are only a few clients of ownerRenderer(): WebCore/page/FrameView.cpp: RenderPart* renderer = m_frame->ownerRenderer(); WebCore/page/FrameView.cpp: if (RenderPart* renderer = m_frame->ownerRenderer()) WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp: if (frame->ownerRenderer()) WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp: frame->ownerRenderer()->setWidget(frameView); WebKit/mac/WebView/WebFrameView.mm: if (RenderPart* owner = frame->ownerRenderer()) { WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp: if (m_frame->ownerRenderer()) WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp: m_frame->ownerRenderer()->setWidget(frameView); WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp: if (frame->ownerRenderer()) WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp: frame->ownerRenderer()->setWidget(frameView); It looks safe to return 0 from ownerRenderer() so I'm going to fix this potential crash by doing so. I'm not sure it's right for HTMLObjectElements to remain the ownerElement for these canceled/errored frames so long... but I guess we can deal with that later. 78130 5 20671 eric 2008-04-18 10:50:06 -0700 Created attachment 20671 Actually fix the ASSERT/potential crasher 78158 6 eric 2008-04-18 13:26:24 -0700 Hum.. I bet if some Apple person searched Radar or crashtracer there would be results related to this. 78160 7 20671 darin 2008-04-18 13:27:16 -0700 Comment on attachment 20671 Actually fix the ASSERT/potential crasher + if (!subtree && (!root->isRenderView() || !static_cast<RenderView*>(root)->printing())) The isRenderView() check here isn't needed. If subtree is false, it's guaranteed to be a RenderView. Change looks OK otherwise. r=me either as-is or with that fix 78175 8 eric 2008-04-18 14:07:41 -0700 (In reply to comment #7) > (From update of attachment 20671 [edit]) > + if (!subtree && (!root->isRenderView() || > !static_cast<RenderView*>(root)->printing())) > > The isRenderView() check here isn't needed. If subtree is false, it's > guaranteed to be a RenderView. > > Change looks OK otherwise. > > r=me either as-is or with that fix > I'll add a different ASSERT then. Thx. 78182 9 eric 2008-04-18 15:03:32 -0700 Committed: e0d08dbe94fef979b381b6470fdb8a91e9be5c2f M WebCore/ChangeLog M WebCore/page/Frame.cpp M WebCore/rendering/RenderObject.h M WebCore/rendering/RenderPart.h Committed r32232 20670 2008-04-18 10:18:56 -0700 2008-04-18 10:50:06 -0700 cleanup patch which fixes layout issue and shows this crash! test.diff text/plain 5024 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWUu Y3BwCmluZGV4IGZmYmI1OWEuLjhlMjdhMzcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFt ZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTE2OSw2ICsxMTY5LDggQEAg UmVuZGVyVmlldyogRnJhbWU6OmNvbnRlbnRSZW5kZXJlcigpIGNvbnN0CiAgICAgaWYgKCFkb2Mp CiAgICAgICAgIHJldHVybiAwOwogICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gZG9jLT5yZW5k ZXJlcigpOworICAgIGlmICghb2JqZWN0KQorICAgICAgICByZXR1cm4gMDsKICAgICBBU1NFUlQo b2JqZWN0LT5pc1JlbmRlclZpZXcoKSk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlclZp ZXcqPihvYmplY3QpOwogfQpAQCAtMTE4Myw3ICsxMTg1LDExIEBAIFJlbmRlclBhcnQqIEZyYW1l Ojpvd25lclJlbmRlcmVyKCkgY29uc3QKICAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVy RWxlbWVudCA9IGQtPm1fb3duZXJFbGVtZW50OwogICAgIGlmICghb3duZXJFbGVtZW50KQogICAg ICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVuZGVyUGFydCo+KG93bmVy RWxlbWVudC0+cmVuZGVyZXIoKSk7CisgICAgUmVuZGVyT2JqZWN0KiBvYmplY3QgPSBvd25lckVs ZW1lbnQtPnJlbmRlcmVyKCk7CisgICAgaWYgKCFvYmplY3QpCisgICAgICAgIHJldHVybiAwOwor ICAgIEFTU0VSVChvYmplY3QtPmlzUmVuZGVyUGFydCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8UmVuZGVyUGFydCo+KG9iamVjdCk7CiB9CiAKIC8vIHJldHVybnMgRmxvYXRSZWN0IGJlY2F1 c2UgZ29pbmcgdGhyb3VnaCBJbnRSZWN0IHdvdWxkIHRydW5jYXRlIGFueSBmbG9hdHMKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKaW5kZXggZGJlODdkNy4uNWEyNWNhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTQ5MCw5ICs0 OTAsNyBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgCiAg ICAgZC0+bGF5b3V0U2NoZWR1bGluZ0VuYWJsZWQgPSB0cnVlOwogCi0gICAgLy8gRklYTUU6IGlz IHJvb3QgYWx3YXlzIGEgUmVuZGVyVmlldz8gaWYgc28sIHN0YXRpY19jYXN0IGF0IGluaXRpYWxp emF0aW9uCi0gICAgQVNTRVJUKHJvb3QtPmlzUmVuZGVyVmlldygpKTsKLSAgICBpZiAoIXN1YnRy ZWUgJiYgIXN0YXRpY19jYXN0PFJlbmRlclZpZXcqPihyb290KS0+cHJpbnRpbmcoKSkKKyAgICBp ZiAoIXN1YnRyZWUgJiYgKCFyb290LT5pc1JlbmRlclZpZXcoKSB8fCAhc3RhdGljX2Nhc3Q8UmVu ZGVyVmlldyo+KHJvb3QpLT5wcmludGluZygpKSkKICAgICAgICAgYWRqdXN0Vmlld1NpemUoKTsK IAogICAgIC8vIE5vdyB1cGRhdGUgdGhlIHBvc2l0aW9ucyBvZiBhbGwgbGF5ZXJzLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAppbmRleCAxNmYzODU0Li41YjVkY2YyIDEwMDY0NAotLS0gYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuaApAQCAtMjU2LDM0ICsyNTYsMzYgQEAgcHJpdmF0ZToKIHB1YmxpYzoKICAgICBS ZW5kZXJBcmVuYSogcmVuZGVyQXJlbmEoKSBjb25zdCB7IHJldHVybiBkb2N1bWVudCgpLT5yZW5k ZXJBcmVuYSgpOyB9CiAKLSAgICB2aXJ0dWFsIGJvb2wgaXNSZW5kZXJCbG9jaygpIGNvbnN0IHsg cmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzUmVuZGVySW5saW5lKCkgY29uc3Qg eyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNSZW5kZXJJbWFnZSgpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzSW5saW5lRmxvdygpIGNvbnN0 IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzQXBwbGV0KCkgY29uc3QgeyBy ZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNCUigpIGNvbnN0IHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzQmxvY2tGbG93KCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNDb3VudGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cisg ICAgdmlydHVhbCBib29sIGlzRnJhbWVTZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAg IHZpcnR1YWwgYm9vbCBpc0ltYWdlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNJbmxpbmVCbG9ja09ySW5saW5lVGFibGUoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0lubGluZUNvbnRpbnVhdGlvbigpIGNvbnN0OworICAg IHZpcnR1YWwgYm9vbCBpc0lubGluZUZsb3coKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAg IHZpcnR1YWwgYm9vbCBpc0xpc3RCb3goKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZp cnR1YWwgYm9vbCBpc0xpc3RJdGVtKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNMaXN0TWFya2VyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0 dWFsIGJvb2wgaXNDb3VudGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFs IGJvb2wgaXNNZWRpYSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29s IGlzTWVudUxpc3QoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBp c1JlbmRlckJsb2NrKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wg aXNSZW5kZXJJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29s IGlzUmVuZGVySW5saW5lKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJv b2wgaXNSZW5kZXJQYXJ0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJv b2wgaXNSZW5kZXJWaWV3KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGJv b2wgaXNCUigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzU2xp ZGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZSgp IGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzVGFibGVDZWxsKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZUNvbCgpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzVGFibGVSb3coKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlU2VjdGlvbigpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzVGFibGVDb2woKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlKCkgY29uc3QgeyBy ZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNXaWRnZXQoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc0ltYWdlKCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNUZXh0QXJlYSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNl OyB9CiAgICAgdmlydHVhbCBib29sIGlzVGV4dEZpZWxkKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0g ICAgdmlydHVhbCBib29sIGlzRnJhbWVTZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAg IHZpcnR1YWwgYm9vbCBpc0FwcGxldCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmly dHVhbCBib29sIGlzTWVudUxpc3QoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1 YWwgYm9vbCBpc0xpc3RCb3goKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwg Ym9vbCBpc1NsaWRlcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29s IGlzTWVkaWEoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBpc1dp ZGdldCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisKIAogICAgIGJvb2wgaXNSb290KCkgY29u c3QgeyByZXR1cm4gZG9jdW1lbnQoKS0+ZG9jdW1lbnRFbGVtZW50KCkgPT0gbm9kZSgpOyB9CiAg ICAgYm9vbCBpc0JvZHkoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclBhcnQuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnQuaAppbmRleCAzZTVmMTZm Li5lMzM5NDY4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJQYXJ0LmgKKysr IGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUGFydC5oCkBAIC0zNyw2ICszNyw3IEBAIHB1Ymxp YzoKICAgICBSZW5kZXJQYXJ0KEhUTUxGcmFtZU93bmVyRWxlbWVudCopOwogICAgIHZpcnR1YWwg flJlbmRlclBhcnQoKTsKICAgICAKKyAgICB2aXJ0dWFsIGJvb2wgaXNSZW5kZXJQYXJ0KCkgY29u c3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgp IGNvbnN0IHsgcmV0dXJuICJSZW5kZXJQYXJ0IjsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNldFdp ZGdldChXaWRnZXQqKTsKQEAgLTU0LDggKzU1LDYgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgog ICAgIHZpcnR1YWwgdm9pZCBkZWxldGVXaWRnZXQoKTsKLQotICAgIEZyYW1lKiBtX2ZyYW1lOwog fTsKIAogfQo= 20671 2008-04-18 10:50:06 -0700 2008-04-18 13:27:16 -0700 Actually fix the ASSERT/potential crasher fix.patch text/plain 5316 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWUu Y3BwCmluZGV4IGZmYmI1OWEuLmE1MDZlNDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9GcmFt ZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTE2OSw2ICsxMTY5LDggQEAg UmVuZGVyVmlldyogRnJhbWU6OmNvbnRlbnRSZW5kZXJlcigpIGNvbnN0CiAgICAgaWYgKCFkb2Mp CiAgICAgICAgIHJldHVybiAwOwogICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gZG9jLT5yZW5k ZXJlcigpOworICAgIGlmICghb2JqZWN0KQorICAgICAgICByZXR1cm4gMDsKICAgICBBU1NFUlQo b2JqZWN0LT5pc1JlbmRlclZpZXcoKSk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlclZp ZXcqPihvYmplY3QpOwogfQpAQCAtMTE4Myw3ICsxMTg1LDE2IEBAIFJlbmRlclBhcnQqIEZyYW1l Ojpvd25lclJlbmRlcmVyKCkgY29uc3QKICAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVy RWxlbWVudCA9IGQtPm1fb3duZXJFbGVtZW50OwogICAgIGlmICghb3duZXJFbGVtZW50KQogICAg ICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVuZGVyUGFydCo+KG93bmVy RWxlbWVudC0+cmVuZGVyZXIoKSk7CisgICAgUmVuZGVyT2JqZWN0KiBvYmplY3QgPSBvd25lckVs ZW1lbnQtPnJlbmRlcmVyKCk7CisgICAgaWYgKCFvYmplY3QpCisgICAgICAgIHJldHVybiAwOwor ICAgIC8vIEZJWE1FOiBJZiA8b2JqZWN0PiBpcyBldmVyIGZpeGVkIHRvIGRpc2Fzc29jaWF0ZSBp dHNlbGYgZnJvbSBmcmFtZXMKKyAgICAvLyB0aGF0IGl0IGhhcyBzdGFydGVkIGJ1dCBjYW5jZWxl ZCwgdGhlbiB0aGlzIGNhbiB0dXJuIGludG8gYW4gQVNTRVJUCisgICAgLy8gc2luY2UgZC0+bV9v d25lckVsZW1lbnQgd291bGQgYmUgMCB3aGVuIHRoZSBsb2FkIGlzIGNhbmNlbGVkLgorICAgIC8v IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU4NQorICAgIGlmICgh b2JqZWN0LT5pc1JlbmRlclBhcnQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHN0 YXRpY19jYXN0PFJlbmRlclBhcnQqPihvYmplY3QpOwogfQogCiAvLyByZXR1cm5zIEZsb2F0UmVj dCBiZWNhdXNlIGdvaW5nIHRocm91Z2ggSW50UmVjdCB3b3VsZCB0cnVuY2F0ZSBhbnkgZmxvYXRz CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCmluZGV4IGRiZTg3ZDcuLjVhMjVjYWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00 OTAsOSArNDkwLDcgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkK ICAgIAogICAgIGQtPmxheW91dFNjaGVkdWxpbmdFbmFibGVkID0gdHJ1ZTsKIAotICAgIC8vIEZJ WE1FOiBpcyByb290IGFsd2F5cyBhIFJlbmRlclZpZXc/IGlmIHNvLCBzdGF0aWNfY2FzdCBhdCBp bml0aWFsaXphdGlvbgotICAgIEFTU0VSVChyb290LT5pc1JlbmRlclZpZXcoKSk7Ci0gICAgaWYg KCFzdWJ0cmVlICYmICFzdGF0aWNfY2FzdDxSZW5kZXJWaWV3Kj4ocm9vdCktPnByaW50aW5nKCkp CisgICAgaWYgKCFzdWJ0cmVlICYmICghcm9vdC0+aXNSZW5kZXJWaWV3KCkgfHwgIXN0YXRpY19j YXN0PFJlbmRlclZpZXcqPihyb290KS0+cHJpbnRpbmcoKSkpCiAgICAgICAgIGFkanVzdFZpZXdT aXplKCk7CiAKICAgICAvLyBOb3cgdXBkYXRlIHRoZSBwb3NpdGlvbnMgb2YgYWxsIGxheWVycy4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggMTZmMzg1NC4uNWI1ZGNmMiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKQEAgLTI1NiwzNCArMjU2LDM2IEBAIHByaXZhdGU6CiBwdWJsaWM6 CiAgICAgUmVuZGVyQXJlbmEqIHJlbmRlckFyZW5hKCkgY29uc3QgeyByZXR1cm4gZG9jdW1lbnQo KS0+cmVuZGVyQXJlbmEoKTsgfQogCi0gICAgdmlydHVhbCBib29sIGlzUmVuZGVyQmxvY2soKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc1JlbmRlcklubGluZSgp IGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzUmVuZGVySW1hZ2Uo KSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc0lubGluZUZsb3co KSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBpc0FwcGxldCgpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzQlIoKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0Jsb2NrRmxvdygpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzQ291bnRlcigpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzRnJhbWUoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQorICAgIHZpcnR1YWwgYm9vbCBpc0ZyYW1lU2V0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAg ICAgdmlydHVhbCBib29sIGlzSW5saW5lQmxvY2tPcklubGluZVRhYmxlKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNJbmxpbmVDb250aW51YXRpb24oKSBjb25z dDsKKyAgICB2aXJ0dWFsIGJvb2wgaXNJbmxpbmVGbG93KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNMaXN0Qm94KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0K ICAgICB2aXJ0dWFsIGJvb2wgaXNMaXN0SXRlbSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAg ICAgdmlydHVhbCBib29sIGlzTGlzdE1hcmtlcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0g ICAgdmlydHVhbCBib29sIGlzQ291bnRlcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAg dmlydHVhbCBib29sIGlzTWVkaWEoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1 YWwgYm9vbCBpc01lbnVMaXN0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFs IGJvb2wgaXNSZW5kZXJCbG9jaygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVh bCBib29sIGlzUmVuZGVySW1hZ2UoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1 YWwgYm9vbCBpc1JlbmRlcklubGluZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmly dHVhbCBib29sIGlzUmVuZGVyUGFydCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmly dHVhbCBib29sIGlzUmVuZGVyVmlldygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmly dHVhbCBib29sIGlzQlIoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9v bCBpc1NsaWRlcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlz VGFibGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxl Q2VsbCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGlzVGFibGVD b2woKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlUm93 KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZVNlY3Rp b24oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlQ29s KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZSgpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzV2lkZ2V0KCkgY29uc3Qg eyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNJbWFnZSgpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzVGV4dEFyZWEoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1RleHRGaWVsZCgpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlzRnJhbWUoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc0ZyYW1lU2V0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNBcHBsZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQot ICAgIHZpcnR1YWwgYm9vbCBpc01lbnVMaXN0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAg ICB2aXJ0dWFsIGJvb2wgaXNMaXN0Qm94KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2 aXJ0dWFsIGJvb2wgaXNTbGlkZXIoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1 YWwgYm9vbCBpc01lZGlhKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJv b2wgaXNXaWRnZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorCiAKICAgICBib29sIGlzUm9v dCgpIGNvbnN0IHsgcmV0dXJuIGRvY3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgpID09IG5vZGUo KTsgfQogICAgIGJvb2wgaXNCb2R5KCkgY29uc3Q7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJQYXJ0LmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJQYXJ0LmgKaW5kZXgg M2U1ZjE2Zi4uZTMzOTQ2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUGFy dC5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclBhcnQuaApAQCAtMzcsNiArMzcsNyBA QCBwdWJsaWM6CiAgICAgUmVuZGVyUGFydChIVE1MRnJhbWVPd25lckVsZW1lbnQqKTsKICAgICB2 aXJ0dWFsIH5SZW5kZXJQYXJ0KCk7CiAgICAgCisgICAgdmlydHVhbCBib29sIGlzUmVuZGVyUGFy dCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIHJlbmRl ck5hbWUoKSBjb25zdCB7IHJldHVybiAiUmVuZGVyUGFydCI7IH0KIAogICAgIHZpcnR1YWwgdm9p ZCBzZXRXaWRnZXQoV2lkZ2V0Kik7CkBAIC01NCw4ICs1NSw2IEBAIHByb3RlY3RlZDoKIAogcHJp dmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlV2lkZ2V0KCk7Ci0KLSAgICBGcmFtZSogbV9m cmFtZTsKIH07CiAKIH0K