145645 2015-06-04 10:29:27 -0700 [GTK] [Wayland] The MiniBrowser crashes inside Weston. 2015-06-05 10:20:35 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81456 1 clopez clopez cgarcia itoral mrobinson zan oldest_to_newest 1099508 0 clopez 2015-06-04 10:29:27 -0700 The MiniBrowser inside Weston crashes if you build current trunk of WebKitGTK+ with the Wayland target. The issue seems to be that we are not properly initializing the Wayland display. Patch is coming. 1099530 1 254276 clopez 2015-06-04 11:00:11 -0700 Created attachment 254276 Patch 1099532 2 clopez 2015-06-04 11:07:39 -0700 BTW, if you run weston inside X, you have to unset the DISPLAY environment value before executing the MiniBrowser inside the weston terminal. Otherwise another crash happens (I still didn't checked that one, but I think is unrelated with the one on this bug) 1099775 3 254276 cgarcia 2015-06-05 00:18:03 -0700 Comment on attachment 254276 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254276&action=review Commenting only about minor stuff, I leave the actual review for Zan > Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:60 > + struct wl_display* wlDisplay = wl_display_connect(0); 0 -> nullptr > Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:62 > + g_warning("PlatformDisplayWayland initialization: failed to connect to the Wayland server socket. Check your WAYLAND_DISPLAY or WAYLAND_SOCKET environment variables."); Use WTFLogAlways instead of g_warning > Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:68 > + g_warning("PlatformDisplayWayland initialization: failed to complete the initialization of the display."); Ditto. 1099794 4 254351 clopez 2015-06-05 05:34:51 -0700 Created attachment 254351 Patch 1099798 5 254353 clopez 2015-06-05 06:24:54 -0700 Created attachment 254353 Patch Only a trivial change to add a link on the changelog to the actual revision/line referenced. 1099802 6 254353 mrobinson 2015-06-05 07:08:39 -0700 Comment on attachment 254353 Patch Perhaps Zan can confirm, but I wonder if this is simply because the UIProcess-embedded Wayland subcompositer is not implemented yet. If so, we can always change the strings back when it's in place. 1099813 7 zan 2015-06-05 08:59:05 -0700 (In reply to comment #6) > Comment on attachment 254353 [details] > Patch > > Perhaps Zan can confirm, but I wonder if this is simply because the > UIProcess-embedded Wayland subcompositer is not implemented yet. If so, we > can always change the strings back when it's in place. That's pretty much the reason why a specific string is used in the wl_display_connect() call, and why that leads to a failure when invoked from the UIProcess. I think there should be possible to connect the WebProcess and the nested compositor in the UIProcess some other way, so the socket name can be removed. 1099814 8 254353 zan 2015-06-05 09:00:47 -0700 Comment on attachment 254353 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254353&action=review > Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:50 > - else if (!std::strcmp(interface, "wl_webkitgtk")) > + else if (!std::strcmp(interface, "wl_shell")) > display->m_webkitgtk = static_cast<struct wl_webkitgtk*>(wl_registry_bind(registry, name, &wl_webkitgtk_interface, 1)); This else-if branch should be removed completely at this point. 1099815 9 254353 zan 2015-06-05 09:03:10 -0700 Comment on attachment 254353 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254353&action=review > Source/WebCore/ChangeLog:18 > + (WebCore::PlatformDisplayWayland::globalCallback): We should check for the > + string "wl_shell" in order to get the notification that the shell surface is > + available because this is the name of this object in the Wayland protocol. wl_webkitgtk and wl_shell interfaces are not interchangeable, so this is not correct. wl_webkitgtk interface is specific to the nested compositor implementation, used by the WebProcess which behaves as a client to that compositor. wl_shell is a more generic interface with greater capabilities, exposed by the parent compositor. 1099823 10 clopez 2015-06-05 09:38:10 -0700 (In reply to comment #8) > Comment on attachment 254353 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=254353&action=review > > > Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp:50 > > - else if (!std::strcmp(interface, "wl_webkitgtk")) > > + else if (!std::strcmp(interface, "wl_shell")) > > display->m_webkitgtk = static_cast<struct wl_webkitgtk*>(wl_registry_bind(registry, name, &wl_webkitgtk_interface, 1)); > > This else-if branch should be removed completely at this point. If I remove that branch then I have to also to apply this patch: --- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h +++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.h @@ -58,7 +58,7 @@ private: static void globalRemoveCallback(void* data, struct wl_registry*, uint32_t name); PlatformDisplayWayland(struct wl_display*); - bool isInitialized() { return m_compositor && m_webkitgtk && m_eglDisplay != EGL_NO_DISPLAY && m_eglConfigChosen; } + bool isInitialized() { return m_compositor && m_eglDisplay != EGL_NO_DISPLAY && m_eglConfigChosen; } Type type() const override { return PlatformDisplay::Type::Wayland; } In order to isInitialized return true. So, I can let that else-if branch without touching it because we not longer check m_webkitgtk in isInitialized 1099834 11 254358 clopez 2015-06-05 09:55:56 -0700 Created attachment 254358 Patch Updated to not touch the else-if branch, but instead removed the check for the nested subcompositor in isInitialized() 1099843 12 254358 zan 2015-06-05 10:16:34 -0700 Comment on attachment 254358 Patch OK, thanks. 1099847 13 254358 clopez 2015-06-05 10:20:22 -0700 Comment on attachment 254358 Patch Clearing flags on attachment: 254358 Committed r185252: <http://trac.webkit.org/changeset/185252> 1099848 14 clopez 2015-06-05 10:20:35 -0700 All reviewed patches have been landed. Closing bug. 254276 2015-06-04 11:00:11 -0700 2015-06-05 05:34:45 -0700 Patch bug-145645-20150604195949.patch text/plain 3673 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDgwOWFkNGQ4MTY0YjY3 ZjYyOTIzNTQwOGZkMjg0ZWRmYzQyOTU5NC4uODhjMGVhODNjNjA4ODM4NmJkMjdjNWYyM2ZmMWQz YTZmY2YyMWE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA2LTA0ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFtXYXlsYW5kXSBUaGUgTWluaUJyb3dzZXIgY3Jhc2hlcyBpbnNpZGUgV2VzdG9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NjQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgY2F1c2VkIGJl Y2F1c2Ugd2Ugd2VyZSBub3QgcHJvcGVybHkgaW5pdGlhbGl6aW5nIHRoZQorICAgICAgICBXYXls YW5kIGRpc3BsYXksIGFuZCB3ZSB3ZXJlIHJldHVybmluZyBhIG51bGxwdHIgaW4gUGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6Y3JlYXRlKCksCisgICAgICAgIHRoZXJlZm9yZSBhIGNyYXNoIHdhcyBo YXBwZW5pbmcgb24gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHA6MTEzNgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURp c3BsYXlXYXlsYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheVdheWxh bmQ6Omdsb2JhbENhbGxiYWNrKTogV2Ugc2hvdWxkIGNoZWNrIGZvciB0aGUKKyAgICAgICAgc3Ry aW5nICJ3bF9zaGVsbCIgaW4gb3JkZXIgdG8gZ2V0IHRoZSBub3RpZmljYXRpb24gdGhhdCB0aGUg c2hlbGwgc3VyZmFjZSBpcworICAgICAgICBhdmFpbGFibGUgYmVjYXVzZSB0aGlzIGlzIHRoZSBu YW1lIG9mIHRoaXMgb2JqZWN0IGluIHRoZSBXYXlsYW5kIHByb3RvY29sLgorICAgICAgICAoV2Vi Q29yZTo6UGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Y3JlYXRlKTogV2hlbiBjb25uZWN0aW5nIHRv IHRoZSBXYXlsYW5kCisgICAgICAgIHNlcnZlciBzb2NrZXQgd2Ugc2hvdWxkIHVzZSB0aGUgZGVm YXVsdCB2YWx1ZSAoTlVMTCkuIFRoaXMgYWxsb3dzIHRoZSB2YWx1ZQorICAgICAgICB0byBiZSBv dmVyd3JpdHRlbiBhdCBydW4tdGltZSBieSB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVzIFdBWUxB TkRfRElTUExBWSBvcgorICAgICAgICBXQVlMQU5EX1NPQ0tFVCB0aGF0IHRoZSBXYXlsYW5kIGNv bXBvc2l0b3Igc2hvdWxkIGRlZmluZS4gQWxzbyBhZGQgYSBjb3VwbGUKKyAgICAgICAgb2Ygd2Fy bmluZ3MgdG8gZ2V0IGluZm9ybWF0aW9uIGFib3V0IHdoYXQgaXMgZ29pbmcgd3Jvbmcgd2hlbiB3 ZSBmYWlsIHRvCisgICAgICAgIGluaXRpYWxpemUgdGhlIGRpc3BsYXkgaW5zdGVhZCBvZiBqdXN0 IGNyYXNoaW5nIHdpdGhvdXQgZ2l2aW5nIG1vcmUgaW5mb3JtYXRpb24uCisKIDIwMTUtMDYtMDMg IENhcmxvcyBBbGJlcnRvIExvcGV6IFBlcmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gW1dheWxhbmRdIEJ1aWxkIGlzIGJyb2tlbiBvbiB0cnVuawpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlX YXlsYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQvUGxh dGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAKaW5kZXggODg4YjI1MzUwNDJjMmJjNGFkZGRlMDEzZDRm Y2ZkYzcyNzRiMzFmYS4uMjRjNjcxMDkwMzc2NzNjMDdjMDcyYzQ2ZWU1MTljNzNjNjJmOWFkYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0 Zm9ybURpc3BsYXlXYXlsYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwCkBAIC00NSw3ICs0NSw3IEBA IHZvaWQgUGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Z2xvYmFsQ2FsbGJhY2sodm9pZCogZGF0YSwg c3RydWN0IHdsX3JlZ2lzdHJ5KiByZWdpCiAgICAgYXV0byBkaXNwbGF5ID0gc3RhdGljX2Nhc3Q8 UGxhdGZvcm1EaXNwbGF5V2F5bGFuZCo+KGRhdGEpOwogICAgIGlmICghc3RkOjpzdHJjbXAoaW50 ZXJmYWNlLCAid2xfY29tcG9zaXRvciIpKQogICAgICAgICBkaXNwbGF5LT5tX2NvbXBvc2l0b3Ig PSBzdGF0aWNfY2FzdDxzdHJ1Y3Qgd2xfY29tcG9zaXRvcio+KHdsX3JlZ2lzdHJ5X2JpbmQocmVn aXN0cnksIG5hbWUsICZ3bF9jb21wb3NpdG9yX2ludGVyZmFjZSwgMSkpOwotICAgIGVsc2UgaWYg KCFzdGQ6OnN0cmNtcChpbnRlcmZhY2UsICJ3bF93ZWJraXRndGsiKSkKKyAgICBlbHNlIGlmICgh c3RkOjpzdHJjbXAoaW50ZXJmYWNlLCAid2xfc2hlbGwiKSkKICAgICAgICAgZGlzcGxheS0+bV93 ZWJraXRndGsgPSBzdGF0aWNfY2FzdDxzdHJ1Y3Qgd2xfd2Via2l0Z3RrKj4od2xfcmVnaXN0cnlf YmluZChyZWdpc3RyeSwgbmFtZSwgJndsX3dlYmtpdGd0a19pbnRlcmZhY2UsIDEpKTsKIH0KIApA QCAtNTcsMTMgKzU3LDE3IEBAIHZvaWQgUGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Z2xvYmFsUmVt b3ZlQ2FsbGJhY2sodm9pZCosIHN0cnVjdCB3bF9yZWdpc3RyeSosIHVpCiAKIHN0ZDo6dW5pcXVl X3B0cjxQbGF0Zm9ybURpc3BsYXlXYXlsYW5kPiBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kOjpjcmVh dGUoKQogewotICAgIHN0cnVjdCB3bF9kaXNwbGF5KiB3bERpc3BsYXkgPSB3bF9kaXNwbGF5X2Nv bm5lY3QoIndlYmtpdGd0ay13YXlsYW5kLWNvbXBvc2l0b3Itc29ja2V0Iik7Ci0gICAgaWYgKCF3 bERpc3BsYXkpCisgICAgc3RydWN0IHdsX2Rpc3BsYXkqIHdsRGlzcGxheSA9IHdsX2Rpc3BsYXlf Y29ubmVjdCgwKTsKKyAgICBpZiAoIXdsRGlzcGxheSkgeworICAgICAgICBnX3dhcm5pbmcoIlBs YXRmb3JtRGlzcGxheVdheWxhbmQgaW5pdGlhbGl6YXRpb246IGZhaWxlZCB0byBjb25uZWN0IHRv IHRoZSBXYXlsYW5kIHNlcnZlciBzb2NrZXQuIENoZWNrIHlvdXIgV0FZTEFORF9ESVNQTEFZIG9y IFdBWUxBTkRfU09DS0VUIGVudmlyb25tZW50IHZhcmlhYmxlcy4iKTsKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CisgICAgfQogCiAgICAgYXV0byBkaXNwbGF5ID0gc3RkOjp1bmlxdWVfcHRyPFBs YXRmb3JtRGlzcGxheVdheWxhbmQ+KG5ldyBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kKHdsRGlzcGxh eSkpOwotICAgIGlmICghZGlzcGxheS0+aXNJbml0aWFsaXplZCgpKQorICAgIGlmICghZGlzcGxh eS0+aXNJbml0aWFsaXplZCgpKSB7CisgICAgICAgIGdfd2FybmluZygiUGxhdGZvcm1EaXNwbGF5 V2F5bGFuZCBpbml0aWFsaXphdGlvbjogZmFpbGVkIHRvIGNvbXBsZXRlIHRoZSBpbml0aWFsaXph dGlvbiBvZiB0aGUgZGlzcGxheS4iKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQog CiAgICAgcmV0dXJuIGRpc3BsYXk7CiB9Cg== 254351 2015-06-05 05:34:51 -0700 2015-06-05 06:24:47 -0700 Patch bug-145645-20150605143428.patch text/plain 3835 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgxYTc3Y2NlYWM4N2Rm MDdhNTdiZjQ1NmNhNmQ5MWI4Mjc3MDQwOC4uNWM4MDhhMmRkNGE4YTVlYzhhMzA1Mzk3ZGIyNjgx MzNkODUyZDg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA2LTA0ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFtXYXlsYW5kXSBUaGUgTWluaUJyb3dzZXIgY3Jhc2hlcyBpbnNpZGUgV2VzdG9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NjQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgY2F1c2VkIGJl Y2F1c2Ugd2Ugd2VyZSBub3QgcHJvcGVybHkgaW5pdGlhbGl6aW5nIHRoZQorICAgICAgICBXYXls YW5kIGRpc3BsYXksIGFuZCB3ZSB3ZXJlIHJldHVybmluZyBhIG51bGxwdHIgaW4gUGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6Y3JlYXRlKCksCisgICAgICAgIHRoZXJlZm9yZSBhIGNyYXNoIHdhcyBo YXBwZW5pbmcgb24gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHA6MTEzNgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURp c3BsYXlXYXlsYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheVdheWxh bmQ6Omdsb2JhbENhbGxiYWNrKTogV2Ugc2hvdWxkIGNoZWNrIGZvciB0aGUKKyAgICAgICAgc3Ry aW5nICJ3bF9zaGVsbCIgaW4gb3JkZXIgdG8gZ2V0IHRoZSBub3RpZmljYXRpb24gdGhhdCB0aGUg c2hlbGwgc3VyZmFjZSBpcworICAgICAgICBhdmFpbGFibGUgYmVjYXVzZSB0aGlzIGlzIHRoZSBu YW1lIG9mIHRoaXMgb2JqZWN0IGluIHRoZSBXYXlsYW5kIHByb3RvY29sLgorICAgICAgICAoV2Vi Q29yZTo6UGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Y3JlYXRlKTogV2hlbiBjb25uZWN0aW5nIHRv IHRoZSBXYXlsYW5kCisgICAgICAgIHNlcnZlciBzb2NrZXQgd2Ugc2hvdWxkIHVzZSB0aGUgZGVm YXVsdCB2YWx1ZSAoTlVMTCkuIFRoaXMgYWxsb3dzIHRoZSB2YWx1ZQorICAgICAgICB0byBiZSBv dmVyd3JpdHRlbiBhdCBydW4tdGltZSBieSB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVzIFdBWUxB TkRfRElTUExBWSBvcgorICAgICAgICBXQVlMQU5EX1NPQ0tFVCB0aGF0IHRoZSBXYXlsYW5kIGNv bXBvc2l0b3Igc2hvdWxkIGRlZmluZS4gQWxzbyBhZGQgYSBjb3VwbGUKKyAgICAgICAgb2Ygd2Fy bmluZ3MgdG8gZ2V0IGluZm9ybWF0aW9uIGFib3V0IHdoYXQgaXMgZ29pbmcgd3Jvbmcgd2hlbiB3 ZSBmYWlsIHRvCisgICAgICAgIGluaXRpYWxpemUgdGhlIGRpc3BsYXkgaW5zdGVhZCBvZiBqdXN0 IGNyYXNoaW5nIHdpdGhvdXQgZ2l2aW5nIG1vcmUgaW5mb3JtYXRpb24uCisKIDIwMTUtMDYtMDQg IEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFB1cmdl IFBhc3NSZWZQdHIgY3JlYXRlKCkgZmFjdG9yeSBmdW5jdGlvbnMgaW4gV2ViQ29yZS9jc3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQvUGxhdGZv cm1EaXNwbGF5V2F5bGFuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwCmluZGV4IDg4OGIyNTM1MDQyYzJiYzRh ZGRkZTAxM2Q0ZmNmZGM3Mjc0YjMxZmEuLjBlMmEyMWNmYjE4ZWEwMTk1ZDRhMWU0YzZjM2RjMDNk ODMyNmE1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dh eWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmNwcApAQCAtMzIs NiArMzIsNyBAQAogI2luY2x1ZGUgIldheWxhbmRTdXJmYWNlLmgiCiAjaW5jbHVkZSA8Y3N0cmlu Zz4KICNpbmNsdWRlIDxnbGliLmg+CisjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NSw3ICs0Niw3IEBAIHZvaWQgUGxhdGZvcm1EaXNwbGF5 V2F5bGFuZDo6Z2xvYmFsQ2FsbGJhY2sodm9pZCogZGF0YSwgc3RydWN0IHdsX3JlZ2lzdHJ5KiBy ZWdpCiAgICAgYXV0byBkaXNwbGF5ID0gc3RhdGljX2Nhc3Q8UGxhdGZvcm1EaXNwbGF5V2F5bGFu ZCo+KGRhdGEpOwogICAgIGlmICghc3RkOjpzdHJjbXAoaW50ZXJmYWNlLCAid2xfY29tcG9zaXRv ciIpKQogICAgICAgICBkaXNwbGF5LT5tX2NvbXBvc2l0b3IgPSBzdGF0aWNfY2FzdDxzdHJ1Y3Qg d2xfY29tcG9zaXRvcio+KHdsX3JlZ2lzdHJ5X2JpbmQocmVnaXN0cnksIG5hbWUsICZ3bF9jb21w b3NpdG9yX2ludGVyZmFjZSwgMSkpOwotICAgIGVsc2UgaWYgKCFzdGQ6OnN0cmNtcChpbnRlcmZh Y2UsICJ3bF93ZWJraXRndGsiKSkKKyAgICBlbHNlIGlmICghc3RkOjpzdHJjbXAoaW50ZXJmYWNl LCAid2xfc2hlbGwiKSkKICAgICAgICAgZGlzcGxheS0+bV93ZWJraXRndGsgPSBzdGF0aWNfY2Fz dDxzdHJ1Y3Qgd2xfd2Via2l0Z3RrKj4od2xfcmVnaXN0cnlfYmluZChyZWdpc3RyeSwgbmFtZSwg JndsX3dlYmtpdGd0a19pbnRlcmZhY2UsIDEpKTsKIH0KIApAQCAtNTcsMTMgKzU4LDE3IEBAIHZv aWQgUGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Z2xvYmFsUmVtb3ZlQ2FsbGJhY2sodm9pZCosIHN0 cnVjdCB3bF9yZWdpc3RyeSosIHVpCiAKIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybURpc3BsYXlX YXlsYW5kPiBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kOjpjcmVhdGUoKQogewotICAgIHN0cnVjdCB3 bF9kaXNwbGF5KiB3bERpc3BsYXkgPSB3bF9kaXNwbGF5X2Nvbm5lY3QoIndlYmtpdGd0ay13YXls YW5kLWNvbXBvc2l0b3Itc29ja2V0Iik7Ci0gICAgaWYgKCF3bERpc3BsYXkpCisgICAgc3RydWN0 IHdsX2Rpc3BsYXkqIHdsRGlzcGxheSA9IHdsX2Rpc3BsYXlfY29ubmVjdChudWxscHRyKTsKKyAg ICBpZiAoIXdsRGlzcGxheSkgeworICAgICAgICBXVEZMb2dBbHdheXMoIlBsYXRmb3JtRGlzcGxh eVdheWxhbmQgaW5pdGlhbGl6YXRpb246IGZhaWxlZCB0byBjb25uZWN0IHRvIHRoZSBXYXlsYW5k IHNlcnZlciBzb2NrZXQuIENoZWNrIHlvdXIgV0FZTEFORF9ESVNQTEFZIG9yIFdBWUxBTkRfU09D S0VUIGVudmlyb25tZW50IHZhcmlhYmxlcy4iKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Cisg ICAgfQogCiAgICAgYXV0byBkaXNwbGF5ID0gc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtRGlzcGxh eVdheWxhbmQ+KG5ldyBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kKHdsRGlzcGxheSkpOwotICAgIGlm ICghZGlzcGxheS0+aXNJbml0aWFsaXplZCgpKQorICAgIGlmICghZGlzcGxheS0+aXNJbml0aWFs aXplZCgpKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiUGxhdGZvcm1EaXNwbGF5V2F5bGFuZCBp bml0aWFsaXphdGlvbjogZmFpbGVkIHRvIGNvbXBsZXRlIHRoZSBpbml0aWFsaXphdGlvbiBvZiB0 aGUgZGlzcGxheS4iKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQogCiAgICAgcmV0 dXJuIGRpc3BsYXk7CiB9Cg== 254353 2015-06-05 06:24:54 -0700 2015-06-05 09:55:48 -0700 Patch bug-145645-20150605152431.patch text/plain 3955 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgxYTc3Y2NlYWM4N2Rm MDdhNTdiZjQ1NmNhNmQ5MWI4Mjc3MDQwOC4uZTM5OWRmOWE5NTQ3Y2YzNGU5MzhjYWMyZDU5ZjYz Y2E1NDM0ZjU1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA2LTA0ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFtXYXlsYW5kXSBUaGUgTWluaUJyb3dzZXIgY3Jhc2hlcyBpbnNpZGUgV2VzdG9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NjQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgY2F1c2VkIGJl Y2F1c2Ugd2Ugd2VyZSBub3QgcHJvcGVybHkgaW5pdGlhbGl6aW5nIHRoZQorICAgICAgICBXYXls YW5kIGRpc3BsYXksIGFuZCB3ZSB3ZXJlIHJldHVybmluZyBhIG51bGxwdHIgaW4gUGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6Y3JlYXRlKCksCisgICAgICAgIHRoZXJlZm9yZSBhIGNyYXNoIHdhcyBo YXBwZW5pbmcgb24gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHA6MTEzNgorICAgICAgICA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9icm93c2VyL3RydW5rL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcD9yZXY9 MTg1MjQ1I0wxMTM2PgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0 Zm9ybURpc3BsYXlXYXlsYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxh eVdheWxhbmQ6Omdsb2JhbENhbGxiYWNrKTogV2Ugc2hvdWxkIGNoZWNrIGZvciB0aGUKKyAgICAg ICAgc3RyaW5nICJ3bF9zaGVsbCIgaW4gb3JkZXIgdG8gZ2V0IHRoZSBub3RpZmljYXRpb24gdGhh dCB0aGUgc2hlbGwgc3VyZmFjZSBpcworICAgICAgICBhdmFpbGFibGUgYmVjYXVzZSB0aGlzIGlz IHRoZSBuYW1lIG9mIHRoaXMgb2JqZWN0IGluIHRoZSBXYXlsYW5kIHByb3RvY29sLgorICAgICAg ICAoV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Y3JlYXRlKTogV2hlbiBjb25uZWN0 aW5nIHRvIHRoZSBXYXlsYW5kCisgICAgICAgIHNlcnZlciBzb2NrZXQgd2Ugc2hvdWxkIHVzZSB0 aGUgZGVmYXVsdCB2YWx1ZSAoTlVMTCkuIFRoaXMgYWxsb3dzIHRoZSB2YWx1ZQorICAgICAgICB0 byBiZSBvdmVyd3JpdHRlbiBhdCBydW4tdGltZSBieSB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGVz IFdBWUxBTkRfRElTUExBWSBvcgorICAgICAgICBXQVlMQU5EX1NPQ0tFVCB0aGF0IHRoZSBXYXls YW5kIGNvbXBvc2l0b3Igc2hvdWxkIGRlZmluZS4gQWxzbyBhZGQgYSBjb3VwbGUKKyAgICAgICAg b2Ygd2FybmluZ3MgdG8gZ2V0IGluZm9ybWF0aW9uIGFib3V0IHdoYXQgaXMgZ29pbmcgd3Jvbmcg d2hlbiB3ZSBmYWlsIHRvCisgICAgICAgIGluaXRpYWxpemUgdGhlIGRpc3BsYXkgaW5zdGVhZCBv ZiBqdXN0IGNyYXNoaW5nIHdpdGhvdXQgZ2l2aW5nIG1vcmUgaW5mb3JtYXRpb24uCisKIDIwMTUt MDYtMDQgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFB1cmdlIFBhc3NSZWZQdHIgY3JlYXRlKCkgZmFjdG9yeSBmdW5jdGlvbnMgaW4gV2ViQ29yZS9j c3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQv UGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwCmluZGV4IDg4OGIyNTM1MDQy YzJiYzRhZGRkZTAxM2Q0ZmNmZGM3Mjc0YjMxZmEuLjBlMmEyMWNmYjE4ZWEwMTk1ZDRhMWU0YzZj M2RjMDNkODMyNmE1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmNwcApA QCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldheWxhbmRTdXJmYWNlLmgiCiAjaW5jbHVkZSA8 Y3N0cmluZz4KICNpbmNsdWRlIDxnbGliLmg+CisjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NSw3ICs0Niw3IEBAIHZvaWQgUGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6Z2xvYmFsQ2FsbGJhY2sodm9pZCogZGF0YSwgc3RydWN0IHdsX3JlZ2lz dHJ5KiByZWdpCiAgICAgYXV0byBkaXNwbGF5ID0gc3RhdGljX2Nhc3Q8UGxhdGZvcm1EaXNwbGF5 V2F5bGFuZCo+KGRhdGEpOwogICAgIGlmICghc3RkOjpzdHJjbXAoaW50ZXJmYWNlLCAid2xfY29t cG9zaXRvciIpKQogICAgICAgICBkaXNwbGF5LT5tX2NvbXBvc2l0b3IgPSBzdGF0aWNfY2FzdDxz dHJ1Y3Qgd2xfY29tcG9zaXRvcio+KHdsX3JlZ2lzdHJ5X2JpbmQocmVnaXN0cnksIG5hbWUsICZ3 bF9jb21wb3NpdG9yX2ludGVyZmFjZSwgMSkpOwotICAgIGVsc2UgaWYgKCFzdGQ6OnN0cmNtcChp bnRlcmZhY2UsICJ3bF93ZWJraXRndGsiKSkKKyAgICBlbHNlIGlmICghc3RkOjpzdHJjbXAoaW50 ZXJmYWNlLCAid2xfc2hlbGwiKSkKICAgICAgICAgZGlzcGxheS0+bV93ZWJraXRndGsgPSBzdGF0 aWNfY2FzdDxzdHJ1Y3Qgd2xfd2Via2l0Z3RrKj4od2xfcmVnaXN0cnlfYmluZChyZWdpc3RyeSwg bmFtZSwgJndsX3dlYmtpdGd0a19pbnRlcmZhY2UsIDEpKTsKIH0KIApAQCAtNTcsMTMgKzU4LDE3 IEBAIHZvaWQgUGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6Z2xvYmFsUmVtb3ZlQ2FsbGJhY2sodm9p ZCosIHN0cnVjdCB3bF9yZWdpc3RyeSosIHVpCiAKIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybURp c3BsYXlXYXlsYW5kPiBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kOjpjcmVhdGUoKQogewotICAgIHN0 cnVjdCB3bF9kaXNwbGF5KiB3bERpc3BsYXkgPSB3bF9kaXNwbGF5X2Nvbm5lY3QoIndlYmtpdGd0 ay13YXlsYW5kLWNvbXBvc2l0b3Itc29ja2V0Iik7Ci0gICAgaWYgKCF3bERpc3BsYXkpCisgICAg c3RydWN0IHdsX2Rpc3BsYXkqIHdsRGlzcGxheSA9IHdsX2Rpc3BsYXlfY29ubmVjdChudWxscHRy KTsKKyAgICBpZiAoIXdsRGlzcGxheSkgeworICAgICAgICBXVEZMb2dBbHdheXMoIlBsYXRmb3Jt RGlzcGxheVdheWxhbmQgaW5pdGlhbGl6YXRpb246IGZhaWxlZCB0byBjb25uZWN0IHRvIHRoZSBX YXlsYW5kIHNlcnZlciBzb2NrZXQuIENoZWNrIHlvdXIgV0FZTEFORF9ESVNQTEFZIG9yIFdBWUxB TkRfU09DS0VUIGVudmlyb25tZW50IHZhcmlhYmxlcy4iKTsKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgfQogCiAgICAgYXV0byBkaXNwbGF5ID0gc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3Jt RGlzcGxheVdheWxhbmQ+KG5ldyBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kKHdsRGlzcGxheSkpOwot ICAgIGlmICghZGlzcGxheS0+aXNJbml0aWFsaXplZCgpKQorICAgIGlmICghZGlzcGxheS0+aXNJ bml0aWFsaXplZCgpKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiUGxhdGZvcm1EaXNwbGF5V2F5 bGFuZCBpbml0aWFsaXphdGlvbjogZmFpbGVkIHRvIGNvbXBsZXRlIHRoZSBpbml0aWFsaXphdGlv biBvZiB0aGUgZGlzcGxheS4iKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQogCiAg ICAgcmV0dXJuIGRpc3BsYXk7CiB9Cg== 254358 2015-06-05 09:55:56 -0700 2015-06-05 10:20:22 -0700 Patch bug-145645-20150605185532.patch text/plain 4412 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTgxYTc3Y2NlYWM4N2Rm MDdhNTdiZjQ1NmNhNmQ5MWI4Mjc3MDQwOC4uM2FkMzA1YmFkNWMxYjA0MmJlNTQ0YWMyZjk5OTM5 M2JmODM3ZGVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA2LTA1ICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFtXYXlsYW5kXSBUaGUgTWluaUJyb3dzZXIgY3Jhc2hlcyBpbnNpZGUgV2VzdG9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NjQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBiZWhhdmlvciBjaGFuZ2VzLgorCisgICAgICAgIFRoZSBpc3N1ZSB3YXMgY2F1c2VkIGJl Y2F1c2Ugd2Ugd2VyZSBub3QgcHJvcGVybHkgaW5pdGlhbGl6aW5nIHRoZQorICAgICAgICBXYXls YW5kIGRpc3BsYXksIGFuZCB3ZSB3ZXJlIHJldHVybmluZyBhIG51bGxwdHIgaW4gUGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6Y3JlYXRlKCksCisgICAgICAgIHRoZXJlZm9yZSBhIGNyYXNoIHdhcyBo YXBwZW5pbmcgb24gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHA6MTEzNgorICAgICAgICA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9icm93c2VyL3RydW5rL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcD9yZXY9 MTg1MjQ1I0wxMTM2PgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0 Zm9ybURpc3BsYXlXYXlsYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxh eVdheWxhbmQ6OmNyZWF0ZSk6IFdoZW4gY29ubmVjdGluZyB0byB0aGUgV2F5bGFuZAorICAgICAg ICBzZXJ2ZXIgc29ja2V0IHdlIHNob3VsZCB1c2UgdGhlIGRlZmF1bHQgdmFsdWUgKE5VTEwpLiBU aGlzIGFsbG93cyB0aGUgdmFsdWUKKyAgICAgICAgdG8gYmUgb3ZlcndyaXR0ZW4gYXQgcnVuLXRp bWUgYnkgdGhlIGVudmlyb25tZW50IHZhcmlhYmxlcyBXQVlMQU5EX0RJU1BMQVkgb3IKKyAgICAg ICAgV0FZTEFORF9TT0NLRVQgdGhhdCB0aGUgV2F5bGFuZCBjb21wb3NpdG9yIHNob3VsZCBkZWZp bmUuIEFsc28gYWRkIGEgY291cGxlCisgICAgICAgIG9mIHdhcm5pbmdzIHRvIGdldCBpbmZvcm1h dGlvbiBhYm91dCB3aGF0IGlzIGdvaW5nIHdyb25nIHdoZW4gd2UgZmFpbCB0bworICAgICAgICBp bml0aWFsaXplIHRoZSBkaXNwbGF5IGluc3RlYWQgb2YganVzdCBjcmFzaGluZyB3aXRob3V0IGdp dmluZyBtb3JlIGluZm9ybWF0aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dheWxh bmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1E aXNwbGF5V2F5bGFuZDo6aXNJbml0aWFsaXplZCk6IE5vdCBsb25nZXIgY2hlY2sgZm9yIG1fd2Vi a2l0Z3RrCisgICAgICAgIHRvIHNpZ25hbCB0aGF0IHRoZSBkaXNwbGF5IGlzIHJlYWR5IGJlY2F1 c2UgdGhlIFVJUHJvY2VzcyBlbWJlZGRlZCBXYXlsYW5kCisgICAgICAgIHN1YmNvbXBvc2l0ZXIg aXMgc3RpbGwgbm90IGltcGxlbWVudGVkLiBBZGRlZCBhIEZJWE1FIG5vdGUgYWJvdXQgaXQuCisK IDIwMTUtMDYtMDQgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFB1cmdlIFBhc3NSZWZQdHIgY3JlYXRlKCkgZmFjdG9yeSBmdW5jdGlvbnMgaW4gV2Vi Q29yZS9jc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dh eWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwCmluZGV4IDg4OGIy NTM1MDQyYzJiYzRhZGRkZTAxM2Q0ZmNmZGM3Mjc0YjMxZmEuLjRkMGQzMzljNzY1YTNjM2VjYmYy ZDM4MzMzNjY0ZGRiZmRiYjJiY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5k LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldheWxhbmRTdXJmYWNlLmgiCiAjaW5j bHVkZSA8Y3N0cmluZz4KICNpbmNsdWRlIDxnbGliLmg+CisjaW5jbHVkZSA8d3RmL0Fzc2VydGlv bnMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC01NywxMyArNTgsMTcgQEAgdm9pZCBQ bGF0Zm9ybURpc3BsYXlXYXlsYW5kOjpnbG9iYWxSZW1vdmVDYWxsYmFjayh2b2lkKiwgc3RydWN0 IHdsX3JlZ2lzdHJ5KiwgdWkKIAogc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtRGlzcGxheVdheWxh bmQ+IFBsYXRmb3JtRGlzcGxheVdheWxhbmQ6OmNyZWF0ZSgpCiB7Ci0gICAgc3RydWN0IHdsX2Rp c3BsYXkqIHdsRGlzcGxheSA9IHdsX2Rpc3BsYXlfY29ubmVjdCgid2Via2l0Z3RrLXdheWxhbmQt Y29tcG9zaXRvci1zb2NrZXQiKTsKLSAgICBpZiAoIXdsRGlzcGxheSkKKyAgICBzdHJ1Y3Qgd2xf ZGlzcGxheSogd2xEaXNwbGF5ID0gd2xfZGlzcGxheV9jb25uZWN0KG51bGxwdHIpOworICAgIGlm ICghd2xEaXNwbGF5KSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiUGxhdGZvcm1EaXNwbGF5V2F5 bGFuZCBpbml0aWFsaXphdGlvbjogZmFpbGVkIHRvIGNvbm5lY3QgdG8gdGhlIFdheWxhbmQgc2Vy dmVyIHNvY2tldC4gQ2hlY2sgeW91ciBXQVlMQU5EX0RJU1BMQVkgb3IgV0FZTEFORF9TT0NLRVQg ZW52aXJvbm1lbnQgdmFyaWFibGVzLiIpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9 CiAKICAgICBhdXRvIGRpc3BsYXkgPSBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1EaXNwbGF5V2F5 bGFuZD4obmV3IFBsYXRmb3JtRGlzcGxheVdheWxhbmQod2xEaXNwbGF5KSk7Ci0gICAgaWYgKCFk aXNwbGF5LT5pc0luaXRpYWxpemVkKCkpCisgICAgaWYgKCFkaXNwbGF5LT5pc0luaXRpYWxpemVk KCkpIHsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJQbGF0Zm9ybURpc3BsYXlXYXlsYW5kIGluaXRp YWxpemF0aW9uOiBmYWlsZWQgdG8gY29tcGxldGUgdGhlIGluaXRpYWxpemF0aW9uIG9mIHRoZSBk aXNwbGF5LiIpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CiAKICAgICByZXR1cm4g ZGlzcGxheTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmgKaW5kZXggMzcwN2Vi MDEzMDBmNWQ4MDczZTEyMTEzOGFlYzE4YzIyOTU4ZWQ1Mi4uNGNjOTA0NDM4MGZmMTEyOWU3Zjdj NmE5ZDQ4ZjY4YThiNWRmYTJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmgK QEAgLTU4LDcgKzU4LDkgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBnbG9iYWxSZW1vdmVD YWxsYmFjayh2b2lkKiBkYXRhLCBzdHJ1Y3Qgd2xfcmVnaXN0cnkqLCB1aW50MzJfdCBuYW1lKTsK IAogICAgIFBsYXRmb3JtRGlzcGxheVdheWxhbmQoc3RydWN0IHdsX2Rpc3BsYXkqKTsKLSAgICBi b29sIGlzSW5pdGlhbGl6ZWQoKSB7IHJldHVybiBtX2NvbXBvc2l0b3IgJiYgbV93ZWJraXRndGsg JiYgbV9lZ2xEaXNwbGF5ICE9IEVHTF9OT19ESVNQTEFZICYmIG1fZWdsQ29uZmlnQ2hvc2VuOyB9 CisKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgY2hlY2sgYWxzbyBmb3IgbV93ZWJraXRndGsg b25jZSB0aGUgVUlQcm9jZXNzIGVtYmVkZGVkIFdheWxhbmQgc3ViY29tcG9zaXRlciBpcyBpbXBs ZW1lbnRlZC4KKyAgICBib29sIGlzSW5pdGlhbGl6ZWQoKSB7IHJldHVybiBtX2NvbXBvc2l0b3Ig JiYgbV9lZ2xEaXNwbGF5ICE9IEVHTF9OT19ESVNQTEFZICYmIG1fZWdsQ29uZmlnQ2hvc2VuOyB9 CiAKICAgICBUeXBlIHR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBQbGF0Zm9ybURpc3Bs YXk6OlR5cGU6OldheWxhbmQ7IH0KIAo=