157005 2016-04-25 16:37:45 -0700 CSP: Add app-specific workaround for Ecobee and Quora 2016-04-27 13:32:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 157100 1 dbates dbates aestes bfulgham commit-queue mkwst sam oldest_to_newest 1187116 0 dbates 2016-04-25 16:37:45 -0700 As of the time of writing, the Ecobee and Quora iOS apps depend on * matching a non-HTTP/HTTPS protocol. Following bug #154122, we restrict matching of * to protocols HTTP, HTTPS in most circumstances. While we work with Ecobee and Quora to resolve this issue in their app, we should add a workaround to avoid breaking these apps. 1187118 1 dbates 2016-04-25 16:38:22 -0700 <rdar://problem/25560776> 1187125 2 277294 dbates 2016-04-25 16:51:39 -0700 Created attachment 277294 Patch I did not write a layout test for this because the proposed setting is specific to the workaround for Quora and Ecobee and not available to embedding clients. This setting should be short lived. Let me know if it is preferred to expose this setting via InternalSettings.in and write a test for this change. 1187190 3 277294 bfulgham 2016-04-25 19:55:57 -0700 Comment on attachment 277294 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277294&action=review r=me > Source/WebCore/platform/RuntimeApplicationChecks.h:77 > +WEBCORE_EXPORT bool isQuora(); I wonder if it would be better to just have a generic "allowContentSecurityPolicySourceStarToMatchAnyProtocol" in case we discover other apps with this same quirk? Since we treat these two apps the same way, I'm not sure there is any benefit to separating them. 1187466 4 dbates 2016-04-26 10:53:02 -0700 (In reply to comment #3) > > Source/WebCore/platform/RuntimeApplicationChecks.h:77 > > +WEBCORE_EXPORT bool isQuora(); > > I wonder if it would be better to just have a generic > "allowContentSecurityPolicySourceStarToMatchAnyProtocol" in case we discover > other apps with this same quirk? I would prefer that we make an exception for Ecobee and Quora instead of enabling this quirk for all apps or all apps linked before the change made in bug #154122 because the change made in bug #154122 improves app security by disallowing all non-HTTP/HTTPs (e.g. file:) subresources that would have been allowed by a policy that contained *. We can evaluate this decision again should we identify more affected apps. > Since we treat these two apps the same way, I'm not sure there is any benefit to separating them. From my understanding the preferred way to accomplish this is to enable the setting allowContentSecurityPolicySourceStarToMatchAnyProtocol for any app built linked against WebKit before WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION. That is, revert the changes to RuntimeApplicationChecks.h and update shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol() to read: static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol() { #if PLATFORM(IOS) static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION); return shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol; #else return false; #endif } 1187776 5 dbates 2016-04-27 09:48:33 -0700 Committed r200130: <http://trac.webkit.org/changeset/200130> 277294 2016-04-25 16:51:39 -0700 2016-04-25 19:55:57 -0700 Patch bug-157005-20160425165206.patch text/plain 9027 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg3OTI3ZjQyN2EyMGI5 NDM2MjRlZmE5MjFlM2EzZjI1M2Q1N2I5Yi4uYzY2NTMxYWI5MTU4MmY4MGUzNzY3YTk2MWViZTE1 OWVkODFjNmI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA0LTI1ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDU1A6IEFkZCBhcHAtc3Bl Y2lmaWMgd29ya2Fyb3VuZCBmb3IgRWNvYmVlIGFuZCBRdW9yYQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3MDA1CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yNTU2MDc3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IEFkZCBzZXR0aW5nIGFsbG93Q29udGVudFNlY3Vy aXR5UG9saWN5U291cmNlU3RhclRvTWF0Y2hBbnlQcm90b2NvbCAoZGlzYWJsZWQgYnkgZGVmYXVs dCkuCisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dDb250ZW50U2VjdXJpdHlQ b2xpY3lTb3VyY2VTdGFyVG9NYXRjaEFueVByb3RvY29sKTogQWRkZWQuCisgICAgICAgICogcGFn ZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVu dFNlY3VyaXR5UG9saWN5U291cmNlTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0Ojppc1Byb3RvY29sQWxsb3dlZEJ5U3Rhcik6IE1vZGlm aWVkIHRvIHJldHVybiB0cnVlCisgICAgICAgIGlmIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxs b3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VTdGFyVG9NYXRjaEFueVByb3RvY29sKCkgZXZh bHVhdGVzIHRvIHRydWUuCisgICAgICAgICogcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hl Y2tzLmg6CisgICAgICAgICogcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLm1tOgor ICAgICAgICAoV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzRWNvYmVlKTogQWRkZWQuCisgICAg ICAgIChXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNRdW9yYSk6IEFkZGVkLgorCiAyMDE2LTA0 LTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBw b3J0IDQxOTAgKG1hbmFnZXNpZXZlKSB0byBwb3J0IGJsYWNrbGlzdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IGIzZWUzMWUxOTYyMDNhYzU4MDAwOGFiNDBjYTRjYTZjMDUwYjExZDMuLmJhM2I4YzczM2Vl OTNkMmFjZDhiY2FkNTg3Yjk1OGVjZTU1ZTk3MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxNi0wNC0yNSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisK KyAgICAgICAgQ1NQOiBBZGQgYXBwLXNwZWNpZmljIHdvcmthcm91bmQgZm9yIEVjb2JlZSBhbmQg UXVvcmEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NzAwNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjU1NjA3NzY+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNaXNjL1dlYktpdFZlcnNpb25DaGVj a3MuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgIChzaG91bGRBbGxv d0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZVN0YXJUb01hdGNoQW55UHJvdG9jb2wpOiBBZGRl ZC4KKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOiBFbmFibGUgc2V0 dGluZyBhbGxvd0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZVN0YXJUb01hdGNoQW55UHJvdG9j b2wKKyAgICAgICAgaWYgYXBwbGljYWJsZS4KKwogMjAxNi0wNC0yMyAgQW5keSBFc3RlcyAgPGFl c3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGlzc3VlcyBmb3VuZCBieSB0aGUgY2xhbmcg c3RhdGljIGFuYWx5emVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz LmluIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgppbmRleCAwNGYxMzg3ZDRjMWEx MDEzMjI4NjIzODdkN2VlNTdjNDU3YmE0ZGUxLi5hZGYyZTc2ODliNTA3MTJhNjNiODg0NGE0OGE2 MDJkNGFhN2M4YmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KQEAgLTI1MSwzICsyNTEsNSBA QCBodHRwRXF1aXZFbmFibGVkIGluaXRpYWw9dHJ1ZQogIyBlbmZvcmNlcyBhbGwgZnJhbWUgc2Fu ZGJveCBmbGFncyAoc2VlIGVudW0gU2FuZGJveEZsYWcgaW4gU2VjdXJpdHlDb250ZXh0LmgpLCBh bmQgYWxzbyBkaXNhYmxlcyA8bWV0YSBodHRwLWVxdWl2PgogIyBwcm9jZXNzaW5nIGFuZCBzdWJm cmFtZSBsb2FkaW5nLgogY29udGVudERpc3Bvc2l0aW9uQXR0YWNobWVudFNhbmRib3hFbmFibGVk IGluaXRpYWw9ZmFsc2UKKworYWxsb3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VTdGFyVG9N YXRjaEFueVByb3RvY29sIGluaXRpYWw9ZmFsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDk4ZWNiNmRjMDQ5MGU1NGMwMjJk NDdkMzMxMzM0MmJmMzA5YzMxN2QuLjgxZDFmNDI0YTcwYmRiMmNiMzU5ZTkzMzEzNzY3MWE4MTEw YjY3OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0 eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5 UG9saWN5LmNwcApAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIlNjaGVtZVJlZ2lzdHJ5Lmgi CiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTZWN1cml0eVBvbGljeVZp b2xhdGlvbkV2ZW50LmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJUZXh0RW5j b2RpbmcuaCIKICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg+CiAjaW5jbHVk ZSA8aW5zcGVjdG9yL1NjcmlwdENhbGxTdGFjay5oPgpAQCAtMjA0LDYgKzIwNSwxMyBAQCBib29s IENvbnRlbnRTZWN1cml0eVBvbGljeTo6dXJsTWF0Y2hlc1NlbGYoY29uc3QgVVJMJiB1cmwpIGNv bnN0CiAgICAgcmV0dXJuIG1fc2VsZlNvdXJjZS0+bWF0Y2hlcyh1cmwpOwogfQogCitib29sIENv bnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VTdGFy VG9NYXRjaEFueVByb3RvY29sKCkgY29uc3QKK3sKKyAgICBpZiAoU2V0dGluZ3MqIHNldHRpbmdz ID0gaXM8RG9jdW1lbnQ+KG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkgPyBkb3duY2FzdDxEb2N1 bWVudD4oKm1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkuc2V0dGluZ3MoKSA6IG51bGxwdHIpCisg ICAgICAgIHJldHVybiBzZXR0aW5ncy0+YWxsb3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VT dGFyVG9NYXRjaEFueVByb3RvY29sKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIENv bnRlbnRTZWN1cml0eVBvbGljeTo6cHJvdG9jb2xNYXRjaGVzU2VsZihjb25zdCBVUkwmIHVybCkg Y29uc3QKIHsKICAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobV9zZWxmU291 cmNlUHJvdG9jb2wsICJodHRwIikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Nz cC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRl bnRTZWN1cml0eVBvbGljeS5oCmluZGV4IDlhNjkzNDFmZGNmYTM0N2Y4NDg4M2I0MGExNmQ3ZDNi YTQ0OWNjOWQuLmRmZDdmNTVlN2Q3Y2NjZjk1NjJmMDFjNWVmOGQwOTU4ODNjMzNmYzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0x MjUsNiArMTI1LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVwb3J0SW52YWxpZFBhdGhDaGFyYWN0 ZXIoY29uc3QgU3RyaW5nJiBkaXJlY3RpdmVOYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25z dCBjaGFyKSBjb25zdDsKICAgICB2b2lkIHJlcG9ydEludmFsaWRTb3VyY2VFeHByZXNzaW9uKGNv bnN0IFN0cmluZyYgZGlyZWN0aXZlTmFtZSwgY29uc3QgU3RyaW5nJiBzb3VyY2UpIGNvbnN0Owog ICAgIGJvb2wgdXJsTWF0Y2hlc1NlbGYoY29uc3QgVVJMJikgY29uc3Q7CisgICAgYm9vbCBhbGxv d0NvbnRlbnRTZWN1cml0eVBvbGljeVNvdXJjZVN0YXJUb01hdGNoQW55UHJvdG9jb2woKSBjb25z dDsKIAogICAgIC8vIFVzZWQgYnkgQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdAog ICAgIHZvaWQgcmVwb3J0RHVwbGljYXRlRGlyZWN0aXZlKGNvbnN0IFN0cmluZyYpIGNvbnN0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5 U291cmNlTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQ b2xpY3lTb3VyY2VMaXN0LmNwcAppbmRleCAzYjM4Mjc5YTJmN2U1Y2FhMjUxNjhkYzU5YjBmOTFm MGIzZmIzNjc4Li4wYmY2YWEyMzkwOTk3MGYwNzgzNDgwYjBhNTc1ZDU5ZDIxZDE4YmM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3lTb3Vy Y2VMaXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50U2VjdXJpdHlQ b2xpY3lTb3VyY2VMaXN0LmNwcApAQCAtMTE4LDYgKzExOCw5IEBAIHZvaWQgQ29udGVudFNlY3Vy aXR5UG9saWN5U291cmNlTGlzdDo6cGFyc2UoY29uc3QgU3RyaW5nJiB2YWx1ZSkKIAogYm9vbCBD b250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0Ojppc1Byb3RvY29sQWxsb3dlZEJ5U3Rhcihj b25zdCBVUkwmIHVybCkgY29uc3QKIHsKKyAgICBpZiAobV9wb2xpY3kuYWxsb3dDb250ZW50U2Vj dXJpdHlQb2xpY3lTb3VyY2VTdGFyVG9NYXRjaEFueVByb3RvY29sKCkpCisgICAgICAgIHJldHVy biB0cnVlOworCiAgICAgLy8gQWx0aG91Z2ggbm90IGFsbG93ZWQgYnkgdGhlIENvbnRlbnQgU2Vj dXJpdHkgUG9saWN5IExldmVsIDMgc3BlYy4sIHdlIGFsbG93IGEgZGF0YSBVUkwgdG8gbWF0Y2gK ICAgICAvLyAiaW1nLXNyYyAqIiBhbmQgZWl0aGVyIGEgZGF0YSBVUkwgb3IgYmxvYiBVUkwgdG8g bWF0Y2ggIm1lZGlhLXNyYyAqIiBmb3Igd2ViIGNvbXBhdGliaWxpdHkuCiAgICAgYm9vbCBpc0Fs bG93ZWQgPSB1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAppbmRleCBkYjQyM2IyNzZm YmU3NjNkNzA2ODdkNTZhMmQxNTI4MGMyYmI4NDliLi5iNmVlN2E3MWZmOWVjNTdiZmI4ZjI3MWQy YjUxYTljOTNhZmRlYzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50 aW1lQXBwbGljYXRpb25DaGVja3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50 aW1lQXBwbGljYXRpb25DaGVja3MuaApAQCAtNzMsNiArNzMsOCBAQCBib29sIGlzTkFTQUhEKCk7 CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzVGhlRWNvbm9taXN0T25JcGhvbmUoKTsKIFdFQkNPUkVf RVhQT1JUIGJvb2wgaXNXZWJQcm9jZXNzKCk7CiBib29sIGlzSUJvb2tzKCk7CitXRUJDT1JFX0VY UE9SVCBib29sIGlzRWNvYmVlKCk7CitXRUJDT1JFX0VYUE9SVCBib29sIGlzUXVvcmEoKTsKIAog fSAvLyBJT1NBcHBsaWNhdGlvbgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9S dW50aW1lQXBwbGljYXRpb25DaGVja3MubW0KaW5kZXggMjhmMmE2MDJjNzUxYzUwYTVjMGYzMmYw NmQ0YjliMDg1ZTBkZDM5NC4uYzhmZGQyYzgyNDVjZDNiZGMzMGYyZTIzMTg0YmM4M2IyZDE0MWY2 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9u Q2hlY2tzLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlv bkNoZWNrcy5tbQpAQCAtMjQxLDYgKzI0MSwxOCBAQCBib29sIElPU0FwcGxpY2F0aW9uOjppc0lC b29rcygpCiAgICAgcmV0dXJuIGlzSUJvb2tzOwogfQogCitib29sIElPU0FwcGxpY2F0aW9uOjpp c0Vjb2JlZSgpCit7CisgICAgc3RhdGljIGJvb2wgaXNFY29iZWUgPSBhcHBsaWNhdGlvbkJ1bmRs ZUlzRXF1YWxUbygiY29tLmVjb2JlZS5hdGhlbmFtb2JpbGUiKTsKKyAgICByZXR1cm4gaXNFY29i ZWU7Cit9CisKK2Jvb2wgSU9TQXBwbGljYXRpb246OmlzUXVvcmEoKQoreworICAgIHN0YXRpYyBi b29sIGlzUXVvcmEgPSBhcHBsaWNhdGlvbkJ1bmRsZUlzRXF1YWxUbygiY29tLnF1b3JhLmFwcC5t b2JpbGUiKTsKKyAgICByZXR1cm4gaXNRdW9yYTsKK30KKwogI2VuZGlmCiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0VmVy c2lvbkNoZWNrcy5oIGIvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tz LmgKaW5kZXggMzkyYzQ0YjZkYjQxZjc5MmIxZDY0YTY0NWI3ZDBmNWYwYWRmYzRjMS4uYWJiYTRi NDYyMTUwZDBhMjk0NGQwZDdhYWNmMzIxMDYzNzg0NTRjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmgKKysrIGIvU291cmNlL1dlYktpdC9t YWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmgKQEAgLTc1LDYgKzc1LDcgQEAKICNkZWZpbmUg V0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lUSE9VVF9MRUdBQ1lfQkFDS0dST1VORFNJWkVfU0hPUlRI QU5EX0JFSEFWSU9SIDI2NjUgLy8gaU9TIDcuMAogI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lP Tl9XSVRIX0xPQURJTkdfRFVSSU5HX0NPTU1PTl9SVU5MT09QX01PREVTIDI2NjUgLy8gaU9TIDcu MAogI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0lOU0VDVVJFX0NPTlRFTlRfQkxP Q0tJTkcgMzQ1NAorI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0NPTlRFTlRfU0VD VVJJVFlfUE9MSUNZX1NPVVJDRV9TVEFSX1BST1RPQ09MX1JFU1RSSUNUSU9OIDM1NTUKICNlbmRp ZiAvLyBQTEFURk9STShJT1MpCiAKICNpZmRlZiBfX2NwbHVzcGx1cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJWaWV3Lm1tCmluZGV4IDEzMDBjMzUyZTdkMTBmMTE4ODRhMjZjNGZmOTY3NzY0Njli YTJiM2UuLjA1YTMyMGM3YTFiZjdhNjViNzg5YjE1MzdjZWZkODNhOTI3NjRlYzUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTg2NSw2ICs4NjUsMTYgQEAgc3RhdGljIGJv b2wgc2hvdWxkQWxsb3dQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjaygpCiAjZW5kaWYKIH0K IAorc3RhdGljIGJvb2wgc2hvdWxkQWxsb3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VTdGFy VG9NYXRjaEFueVByb3RvY29sKCkKK3sKKyNpZiBQTEFURk9STShJT1MpCisgICAgc3RhdGljIGJv b2wgc2hvdWxkQWxsb3dDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VTdGFyVG9NYXRjaEFueVBy b3RvY29sID0gKElPU0FwcGxpY2F0aW9uOjppc0Vjb2JlZSgpIHx8IElPU0FwcGxpY2F0aW9uOjpp c1F1b3JhKCkpICYmICFXZWJLaXRMaW5rZWRPbk9yQWZ0ZXIoV0VCS0lUX0ZJUlNUX1ZFUlNJT05f V0lUSF9DT05URU5UX1NFQ1VSSVRZX1BPTElDWV9TT1VSQ0VfU1RBUl9QUk9UT0NPTF9SRVNUUklD VElPTik7CisgICAgcmV0dXJuIHNob3VsZEFsbG93Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNl U3RhclRvTWF0Y2hBbnlQcm90b2NvbDsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlm Cit9CisKICNpZiBFTkFCTEUoR0FNRVBBRCkKIHN0YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVH YW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiB7CkBAIC0yNTEwLDYgKzI1MjAsOCBAQCAtICh2 b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuY2VzICopcHJlZmVyZW5jZXMKICNp ZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgIHNldHRpbmdzLnNldEF0dGFjaG1lbnRF bGVtZW50RW5hYmxlZChbcHJlZmVyZW5jZXMgYXR0YWNobWVudEVsZW1lbnRFbmFibGVkXSk7CiAj ZW5kaWYKKworICAgIHNldHRpbmdzLnNldEFsbG93Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNl U3RhclRvTWF0Y2hBbnlQcm90b2NvbChzaG91bGRBbGxvd0NvbnRlbnRTZWN1cml0eVBvbGljeVNv dXJjZVN0YXJUb01hdGNoQW55UHJvdG9jb2woKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgSU1QIGdl dE1ldGhvZChpZCBvLCBTRUwgcykK