128904 2014-02-17 05:38:09 -0800 [GTK] ASSERTION FAILED: hasClass() 2014-02-18 08:55:55 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 128820 P2 Normal --- 1 piotr.grad webkit-unassigned oldest_to_newest 981414 0 piotr.grad 2014-02-17 05:38:09 -0800 ASSERTION FAILED: hasClass() ../../Source/WebCore/dom/Element.h(771) : const WebCore::SpaceSplitString& WebCore::Element::classNames() const 1 0x7fffef0980d6 .../WebKitBuild/Debug/.libs/libjavascriptcoregtk-3.0.so.0(WTFCrash+0x1e) [0x7fffef0980d6] 2 0x7ffff3054e6f .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(+0x1ad4e6f) [0x7ffff3054e6f] 3 0x7ffff42046ee .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(+0x2c846ee) [0x7ffff42046ee] 4 0x7ffff4205c4f .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore14RenderThemeGtk20paintMediaPlayButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE+0x6d) [0x7ffff4205c4f] 5 0x7ffff396445d .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderTheme5paintEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE+0x273) [0x7ffff396445d] 6 0x7ffff3801384 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore9RenderBox19paintBoxDecorationsERNS_9PaintInfoERKNS_11LayoutPointE+0x214) [0x7ffff3801384] 7 0x7ffff37a269f .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock11paintObjectERNS_9PaintInfoERKNS_11LayoutPointE+0x1fb) [0x7ffff37a269f] 8 0x7ffff3803713 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore9RenderBox16pushContentsClipERNS_9PaintInfoERKNS_11LayoutPointE+0x111) [0x7ffff3803713] 9 0x7ffff37a019d .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock5paintERNS_9PaintInfoERKNS_11LayoutPointE+0x17b) [0x7ffff37a019d] 10 0x7ffff37a208f .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock10paintChildERNS_9RenderBoxERNS_9PaintInfoERKNS_11LayoutPointES4_b+0x3d7) [0x7ffff37a208f] 11 0x7ffff3854b37 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore17RenderFlexibleBox13paintChildrenERNS_9PaintInfoERKNS_11LayoutPointES2_b+0x5d) [0x7ffff3854b37] 12 0x7ffff37a1c32 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock13paintContentsERNS_9PaintInfoERKNS_11LayoutPointE+0x166) [0x7ffff37a1c32] 13 0x7ffff37a286d .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock11paintObjectERNS_9PaintInfoERKNS_11LayoutPointE+0x3c9) [0x7ffff37a286d] 14 0x7ffff37a01c1 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderBlock5paintERNS_9PaintInfoERKNS_11LayoutPointE+0x19f) [0x7ffff37a01c1] 15 0x7ffff38a9cd3 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer36paintForegroundForFragmentsWithPhaseENS_10PaintPhaseERKN3WTF6VectorINS_13LayerFragmentELm1ENS2_15CrashOnOverflowEEEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEjPNS_12RenderObjectE+0x2b7) [0x7ffff38a9cd3] 16 0x7ffff38a987f .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer27paintForegroundForFragmentsERKN3WTF6VectorINS_13LayerFragmentELm1ENS1_15CrashOnOverflowEEEPNS_15GraphicsContextES9_RKNS_10LayoutRectEbRKNS0_17LayerPaintingInfoEjPNS_12RenderObjectEbb+0x1ef) [0x7ffff38a987f] 17 0x7ffff38a81d8 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer18paintLayerContentsEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x754) [0x7ffff38a81d8] 18 0x7ffff38a72ca .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer31paintLayerContentsAndReflectionEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x108) [0x7ffff38a72ca] 19 0x7ffff38a7192 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer10paintLayerEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x69e) [0x7ffff38a7192] 20 0x7ffff38a8869 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer9paintListEPN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0xaf) [0x7ffff38a8869] 21 0x7ffff38a829b .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer18paintLayerContentsEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x817) [0x7ffff38a829b] 22 0x7ffff38a72ca .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer31paintLayerContentsAndReflectionEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x108) [0x7ffff38a72ca] 23 0x7ffff38a7192 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer10paintLayerEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x69e) [0x7ffff38a7192] 24 0x7ffff38a8869 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer9paintListEPN3WTF6VectorIPS0_Lm0ENS1_15CrashOnOverflowEEEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0xaf) [0x7ffff38a8869] 25 0x7ffff38a829b .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer18paintLayerContentsEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x817) [0x7ffff38a829b] 26 0x7ffff38a72ca .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer31paintLayerContentsAndReflectionEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x108) [0x7ffff38a72ca] 27 0x7ffff38a7192 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer10paintLayerEPNS_15GraphicsContextERKNS0_17LayerPaintingInfoEj+0x69e) [0x7ffff38a7192] 28 0x7ffff38a6308 .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore11RenderLayer5paintEPNS_15GraphicsContextERKNS_10LayoutRectEjPNS_12RenderObjectEPNS_12RenderRegionEj+0x106) [0x7ffff38a6308] 29 0x7ffff36d1f7e .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore9FrameView13paintContentsEPNS_15GraphicsContextERKNS_7IntRectE+0x46c) [0x7ffff36d1f7e] 30 0x7ffff3f8118b .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(_ZN7WebCore10ScrollView5paintEPNS_15GraphicsContextERKNS_7IntRectE+0x2ed) [0x7ffff3f8118b] 31 0x7ffff2bf49fe .../WebKitBuild/Debug/.libs/libwebkitgtk-3.0.so.0(+0x16749fe) [0x7ffff2bf49fe] 981417 1 224360 piotr.grad 2014-02-17 05:48:37 -0800 Created attachment 224360 Patch 981559 2 224360 andersca 2014-02-17 11:20:47 -0800 Comment on attachment 224360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224360&action=review > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:114 > static bool nodeHasClass(Node* node, const char* className) I think this should take a const Node& since it can never be null (You'd have to change the call sites as well). The same thing is true for nodeHasPseudo but that doesn't have to be in this patch. > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:116 > - return node->isElementNode() ? toElement(node)->classNames().contains(className) : false; > + return (node->isElementNode() && toElement(node)->hasClass()) ? toElement(node)->classNames().contains(className) : false; I think this would look better with early returns, something like: if (!node.isElementNode()) return false; const Element& element = toElement(node); if (!element.hasClass()) return false; return element.classNames().contains(className); 981881 3 224493 piotr.grad 2014-02-18 04:15:17 -0800 Created attachment 224493 Patch.txt 981930 4 224493 andersca 2014-02-18 07:50:43 -0800 Comment on attachment 224493 Patch.txt View in context: https://bugs.webkit.org/attachment.cgi?id=224493&action=review > Source/WebCore/platform/gtk/RenderThemeGtk.cpp:122 > + if (!toElement(&node)->hasClass()) > + return false; > + > + return toElement(&node)->classNames().contains(className); As I suggested, please put the element in a local variable here to avoid calling toElement twice (since toElement is a virtual call): const Element& element = toElement(node); (or *toElement(*node) if there's no version that takes references). 981948 5 224517 piotr.grad 2014-02-18 08:49:00 -0800 Created attachment 224517 Patch 981951 6 224517 piotr.grad 2014-02-18 08:55:19 -0800 Comment on attachment 224517 Patch duplicate of https://bugs.webkit.org/show_bug.cgi?id=128820 981952 7 piotr.grad 2014-02-18 08:55:55 -0800 *** This bug has been marked as a duplicate of bug 128820 *** 224360 2014-02-17 05:48:37 -0800 2014-02-18 04:15:17 -0800 Patch patch.txt text/plain 1378 piotr.grad ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODdlMTU3Li41ZTMxYmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDItMTcgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0dUS10gQVNTRVJUSU9OIEZBSUxFRDogaGFzQ2xhc3MoKS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkwNC4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBSZW5kZXJUaGVtZUd0ay5jcHA6Om5v ZGVIYXNDbGFzczogdGhlcmUgd2FzIG1pc3NpbmcgY2hlY2sgaWYgbm9kZSBoYXMgYW55IGNsYXNz IG5hbWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vZGVIYXNDbGFzcyk6CisK IDIwMTQtMDItMTcgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gRml4IG1pc3NpbmcgbGF5b3V0IGluIGZsZXhpYmxl IGFuZCBjb250ZW50IHNpemVkIGNvbHVtbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGZkMjliZWUuLmEwMTU5YjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtMTEzLDcgKzEx Myw3IEBAIHN0YXRpYyBib29sIG5vZGVIYXNQc2V1ZG8oTm9kZSogbm9kZSwgY29uc3QgY2hhciog cHNldWRvKQogCiBzdGF0aWMgYm9vbCBub2RlSGFzQ2xhc3MoTm9kZSogbm9kZSwgY29uc3QgY2hh ciogY2xhc3NOYW1lKQogewotICAgIHJldHVybiBub2RlLT5pc0VsZW1lbnROb2RlKCkgPyB0b0Vs ZW1lbnQobm9kZSktPmNsYXNzTmFtZXMoKS5jb250YWlucyhjbGFzc05hbWUpIDogZmFsc2U7Cisg ICAgcmV0dXJuIChub2RlLT5pc0VsZW1lbnROb2RlKCkgJiYgdG9FbGVtZW50KG5vZGUpLT5oYXND bGFzcygpKSA/IHRvRWxlbWVudChub2RlKS0+Y2xhc3NOYW1lcygpLmNvbnRhaW5zKGNsYXNzTmFt ZSkgOiBmYWxzZTsKIH0KIAogUGFzc1JlZlB0cjxSZW5kZXJUaGVtZT4gUmVuZGVyVGhlbWVHdGs6 OmNyZWF0ZSgpCg== 224493 2014-02-18 04:15:17 -0800 2014-02-18 08:49:00 -0800 Patch.txt patch.txt text/plain 2054 piotr.grad ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODdlMTU3Li41ZTMxYmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDItMTcgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0dUS10gQVNTRVJUSU9OIEZBSUxFRDogaGFzQ2xhc3MoKS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkwNC4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBSZW5kZXJUaGVtZUd0ay5jcHA6Om5v ZGVIYXNDbGFzczogdGhlcmUgd2FzIG1pc3NpbmcgY2hlY2sgaWYgbm9kZSBoYXMgYW55IGNsYXNz IG5hbWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vZGVIYXNDbGFzcyk6CisK IDIwMTQtMDItMTcgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gRml4IG1pc3NpbmcgbGF5b3V0IGluIGZsZXhpYmxl IGFuZCBjb250ZW50IHNpemVkIGNvbHVtbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGZkMjliZWUuLjhjMjZlZDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtMTExLDkgKzEx MSwxNSBAQCBzdGF0aWMgYm9vbCBub2RlSGFzUHNldWRvKE5vZGUqIG5vZGUsIGNvbnN0IGNoYXIq IHBzZXVkbykKICAgICByZXR1cm4gYXR0cmlidXRlTm9kZSA/IGF0dHJpYnV0ZU5vZGUtPm5vZGVW YWx1ZSgpID09IHBzZXVkbyA6IGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBub2RlSGFzQ2xhc3Mo Tm9kZSogbm9kZSwgY29uc3QgY2hhciogY2xhc3NOYW1lKQorc3RhdGljIGJvb2wgbm9kZUhhc0Ns YXNzKGNvbnN0IE5vZGUmIG5vZGUsIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSkKIHsKLSAgICByZXR1 cm4gbm9kZS0+aXNFbGVtZW50Tm9kZSgpID8gdG9FbGVtZW50KG5vZGUpLT5jbGFzc05hbWVzKCku Y29udGFpbnMoY2xhc3NOYW1lKSA6IGZhbHNlOworICAgIGlmICghbm9kZS5pc0VsZW1lbnROb2Rl KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghdG9FbGVtZW50KCZub2RlKS0+ aGFzQ2xhc3MoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRvRWxlbWVu dCgmbm9kZSktPmNsYXNzTmFtZXMoKS5jb250YWlucyhjbGFzc05hbWUpOwogfQogCiBQYXNzUmVm UHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZUd0azo6Y3JlYXRlKCkKQEAgLTUzOCw3ICs1NDQs NyBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhUGxheUJ1dHRvbihSZW5kZXJPYmpl Y3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFpbgogCiAgICAgaWYgKCFub2RlSGFzUHNldWRvKG5v ZGUsICItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0dG9uIikpCiAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICBib29sIHNob3dQbGF5QnV0dG9uID0gbm9kZUhhc0NsYXNzKG5vZGUsICJw YXVzZWQiKTsKKyAgICBib29sIHNob3dQbGF5QnV0dG9uID0gbm9kZUhhc0NsYXNzKCpub2RlLCAi cGF1c2VkIik7CiAKICAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihyZW5kZXJPYmplY3QsIHBh aW50SW5mby5jb250ZXh0LCByZWN0LAogICAgICAgICBzaG93UGxheUJ1dHRvbiA/ICJtZWRpYS1w bGF5YmFjay1zdGFydC1zeW1ib2xpYyIgOiAibWVkaWEtcGxheWJhY2stcGF1c2Utc3ltYm9saWMi LAo= 224517 2014-02-18 08:49:00 -0800 2014-02-18 08:55:19 -0800 Patch patch.txt text/plain 2080 piotr.grad ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODdlMTU3Li41ZTMxYmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDItMTcgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0dUS10gQVNTRVJUSU9OIEZBSUxFRDogaGFzQ2xhc3MoKS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODkwNC4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBSZW5kZXJUaGVtZUd0ay5jcHA6Om5v ZGVIYXNDbGFzczogdGhlcmUgd2FzIG1pc3NpbmcgY2hlY2sgaWYgbm9kZSBoYXMgYW55IGNsYXNz IG5hbWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vZGVIYXNDbGFzcyk6CisK IDIwMTQtMDItMTcgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gRml4IG1pc3NpbmcgbGF5b3V0IGluIGZsZXhpYmxl IGFuZCBjb250ZW50IHNpemVkIGNvbHVtbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGZkMjliZWUuLjQ4ZGIwMTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtMTExLDkgKzEx MSwxNiBAQCBzdGF0aWMgYm9vbCBub2RlSGFzUHNldWRvKE5vZGUqIG5vZGUsIGNvbnN0IGNoYXIq IHBzZXVkbykKICAgICByZXR1cm4gYXR0cmlidXRlTm9kZSA/IGF0dHJpYnV0ZU5vZGUtPm5vZGVW YWx1ZSgpID09IHBzZXVkbyA6IGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBub2RlSGFzQ2xhc3Mo Tm9kZSogbm9kZSwgY29uc3QgY2hhciogY2xhc3NOYW1lKQorc3RhdGljIGJvb2wgbm9kZUhhc0Ns YXNzKGNvbnN0IE5vZGUmIG5vZGUsIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSkKIHsKLSAgICByZXR1 cm4gbm9kZS0+aXNFbGVtZW50Tm9kZSgpID8gdG9FbGVtZW50KG5vZGUpLT5jbGFzc05hbWVzKCku Y29udGFpbnMoY2xhc3NOYW1lKSA6IGZhbHNlOworICAgIGlmICghbm9kZS5pc0VsZW1lbnROb2Rl KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQg PSB0b0VsZW1lbnQobm9kZSk7CisgICAgaWYgKGVsZW1lbnQuaGFzQ2xhc3MoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGVsZW1lbnQuY2xhc3NOYW1lcygpLmNvbnRhaW5z KGNsYXNzTmFtZSk7CiB9CiAKIFBhc3NSZWZQdHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lR3Rr OjpjcmVhdGUoKQpAQCAtNTM4LDcgKzU0NSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50 TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWluCiAK ICAgICBpZiAoIW5vZGVIYXNQc2V1ZG8obm9kZSwgIi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxh eS1idXR0b24iKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGJvb2wgc2hvd1BsYXlCdXR0 b24gPSBub2RlSGFzQ2xhc3Mobm9kZSwgInBhdXNlZCIpOworICAgIGJvb2wgc2hvd1BsYXlCdXR0 b24gPSBub2RlSGFzQ2xhc3MoKm5vZGUsICJwYXVzZWQiKTsKIAogICAgIHJldHVybiBwYWludE1l ZGlhQnV0dG9uKHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsCiAgICAgICAg IHNob3dQbGF5QnV0dG9uID8gIm1lZGlhLXBsYXliYWNrLXN0YXJ0LXN5bWJvbGljIiA6ICJtZWRp YS1wbGF5YmFjay1wYXVzZS1zeW1ib2xpYyIsCg==