115898 2013-05-10 04:43:21 -0700 Begin making SecurityOrigin immutable 2013-05-10 05:23:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 andersca andersca commit-queue esprehn+autocc kling oldest_to_newest 887286 0 andersca 2013-05-10 04:43:21 -0700 Begin making SecurityOrigin immutable 887287 1 201334 andersca 2013-05-10 04:47:09 -0700 Created attachment 201334 Patch 887290 2 201334 kling 2013-05-10 04:56:33 -0700 Comment on attachment 201334 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201334&action=review r=me with some fixing! > Source/WebCore/page/SecurityOrigin.cpp:219 > + return adoptRef(new SecurityOrigin(m_protocol, m_host, domain, m_filePath, m_port, m_isUnique, m_universalAccess, m_domainWasSetInDOM, m_canLoadLocalResources, m_storageBlockingPolicy, m_enforceFilePathSeparation, m_needsDatabaseIdentifierQuirkForFiles)); You're just passing m_domainWasSetInDOM again here, that argument should be true. > Source/WebCore/page/SecurityOrigin.h:80 > - void setDomainFromDOM(const String& newDomain); > + PassRefPtr<SecurityOrigin> securityOriginWithDomainSetFromDOM(const String& newDomain) const; I'd call this securityOriginWithDomainSetFromDOM(). > Source/WebCore/page/SecurityOrigin.h:140 > - void grantUniversalAccess(); > + PassRefPtr<SecurityOrigin> securityOriginWithUniversalAccessGranted() const; I'd call this copyWithUniversalAccessGranted(). 887291 3 kling 2013-05-10 04:57:12 -0700 (In reply to comment #2) > (From update of attachment 201334 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201334&action=review > > > Source/WebCore/page/SecurityOrigin.h:80 > > - void setDomainFromDOM(const String& newDomain); > > + PassRefPtr<SecurityOrigin> securityOriginWithDomainSetFromDOM(const String& newDomain) const; > > I'd call this securityOriginWithDomainSetFromDOM(). I'd call this copyWithDomainSetFromDOM(). 887292 4 kling 2013-05-10 04:57:19 -0700 (In reply to comment #2) > (From update of attachment 201334 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201334&action=review > > > Source/WebCore/page/SecurityOrigin.h:80 > > - void setDomainFromDOM(const String& newDomain); > > + PassRefPtr<SecurityOrigin> securityOriginWithDomainSetFromDOM(const String& newDomain) const; > > I'd call this securityOriginWithDomainSetFromDOM(). I'd call this copyWithDomainSetFromDOM(). 887293 5 andersca 2013-05-10 04:58:38 -0700 Committed r149866: <http://trac.webkit.org/changeset/149866> 887299 6 andersca 2013-05-10 05:22:15 -0700 Reverted r149866 for reason: Broke Committed r149869: <http://trac.webkit.org/changeset/149869> 887300 7 andersca 2013-05-10 05:23:41 -0700 This won’t work since we rely on subframes having their origins linked to their parent frames. 201334 2013-05-10 04:47:09 -0700 2013-05-10 04:56:33 -0700 Patch bug-115898-20130510044611.patch text/plain 9868 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5ODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg3MTkxNjdlNTY5NGU3 NWNjOWZhZDQ1NThjOTg2NjQwMDViNTVmOC4uNGU4MDAzNTJiMTdjYTg4ODI3NzQzYTAyYjk1MDkx Mzc5MDMxZTMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEzLTA1LTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gbWFraW5n IFNlY3VyaXR5T3JpZ2luIGltbXV0YWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE1ODk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBTZWN1cml0eU9yaWdpbjo6c2V0RG9tYWluRnJvbURP TSBhbmQgU2VjdXJpdHlPcmlnaW46OmdyYW50VW5pdmVyc2FsQWNjZXNzIHdpdGgKKyAgICAgICAg bWVtYmVyIGZ1bmN0aW9ucyB0aGF0IHJldHVybiBuZXcgU2VjdXJpdHlPcmlnaW4gb2JqZWN0cy4K KworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6c2V0RG9tYWluKToKKyAgICAgICAgVXBkYXRlIHRoZSBzZWN1cml0eSBvcmlnaW4gdG8gb25l IHJldHVybmVkIGJ5IHNlY3VyaXR5T3JpZ2luV2l0aERvbWFpblNldEZyb21ET00uCisgICAgCisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aW5pdFNlY3VyaXR5Q29udGV4dCk6CisgICAgICAg IFNldCB0aGUgc2VjdXJpdHkgb3JpZ2luIHRvIG9uZSByZXR1cm5lZCBieSBzZWN1cml0eU9yaWdp bldpdGhVbml2ZXJzYWxBY2Nlc3NHcmFudGVkKCkuCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5 T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9y aWdpbik6CisgICAgICAgIEFkZCBhIG5ldyBjb25zdHJ1Y3RvciB0aGF0IHRha2VzIGFsbCB0aGUg bWVtYmVyIHZhcmlhYmxlcyBhcyBwYXJhbWV0ZXJzLiBUaGlzIGlzIGEgbGl0dGxlIHVud2llbGR5 IGF0IHRoZSBtb21lbnQsCisgICAgICAgIGJ1dCBhbGwgdGhlIGJvb2xlYW4gcGFyYW1ldGVycyBj b3VsZCBiZSByZXBsYWNlZCBieSBhIGJpdG1hc2sgb2YgZmxhZ3MuCisKKyAgICAgICAgKFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luOjppc29sYXRlZENvcHkpOgorICAgICAgICBDYWxsIHRoZSBuZXcg Y29uc3RydWN0b3IuCisKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpzZWN1cml0 eU9yaWdpbldpdGhEb21haW5TZXRGcm9tRE9NKToKKyAgICAgICAgUmV0dXJuIGEgbmV3IHNlY3Vy aXR5IG9yaWdpbiB3aXRoIG1fZG9tYWluV2FzU2V0SW5ET00gc2V0IHRvIHRydWUgYW5kIHRoZSBk b21haW4gdXBkYXRlZC4KKworICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OnNlY3Vy aXR5T3JpZ2luV2l0aFVuaXZlcnNhbEFjY2Vzc0dyYW50ZWQpOgorICAgICAgICBSZXR1cm4gYSBu ZXcgc2VjdXJpdHkgb3JpZ2luIHdpdGggbV91bml2ZXJzYWxBY2Nlc3Mgc2V0IHRvIHRydWUuCisK KzIwMTMtMDUtMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAg ICAgICBSZW1vdmUgU2NyaXB0Q29udHJvbGxlcjo6dXBkYXRlU2VjdXJpdHlPcmlnaW4KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTg5NQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAppbmRleCBjMDdjZTk2Y2E4ZDA4OGQ5OWVhMTZkZDdlMGRkNzI1ZTQ5 NjVhYjQ0Li4yYmYxYjYzMzdlMWM0NzBmNDQyMjFmZmU2YWY4NDU3MTcxZjIzZTlkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM4MTAsNyArMzgxMCw3IEBAIHZvaWQgRG9jdW1lbnQ6OnNl dERvbWFpbihjb25zdCBTdHJpbmcmIG5ld0RvbWFpbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAg Ly8gYWxsb3cgb3RoZXIgcGFnZXMgbG9hZGVkIG9uIGRpZmZlcmVudCBwb3J0cyBpbiB0aGUgc2Ft ZSBkb21haW4gdGhhdAogICAgIC8vIGhhdmUgYWxzbyBhc3NpZ25lZCB0byBhY2Nlc3MgdGhpcyBw YWdlLgogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShkb21haW4oKSwgbmV3RG9tYWluKSkgewot ICAgICAgICBzZWN1cml0eU9yaWdpbigpLT5zZXREb21haW5Gcm9tRE9NKG5ld0RvbWFpbik7Cisg ICAgICAgIHNldFNlY3VyaXR5T3JpZ2luKHNlY3VyaXR5T3JpZ2luKCktPnNlY3VyaXR5T3JpZ2lu V2l0aERvbWFpblNldEZyb21ET00obmV3RG9tYWluKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTM4MzcsNyArMzgzNyw3IEBAIHZvaWQgRG9jdW1lbnQ6OnNldERvbWFpbihjb25zdCBT dHJpbmcmIG5ld0RvbWFpbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBzZWN1cml0eU9yaWdpbigpLT5zZXREb21haW5Gcm9tRE9NKG5ld0RvbWFpbik7 CisgICAgc2V0U2VjdXJpdHlPcmlnaW4oc2VjdXJpdHlPcmlnaW4oKS0+c2VjdXJpdHlPcmlnaW5X aXRoRG9tYWluU2V0RnJvbURPTShuZXdEb21haW4pKTsKIH0KIAogLy8gaHR0cDovL3d3dy53aGF0 d2cub3JnL3NwZWNzL3dlYi1hcHBzL2N1cnJlbnQtd29yay8jZG9tLWRvY3VtZW50LWxhc3Rtb2Rp ZmllZApAQCAtNDU5NywxMSArNDU5NywxMSBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlD b250ZXh0KCkKICAgICAgICAgaWYgKCFzZXR0aW5ncy0+d2ViU2VjdXJpdHlFbmFibGVkKCkpIHsK ICAgICAgICAgICAgIC8vIFdlYiBzZWN1cml0eSBpcyB0dXJuZWQgb2ZmLiBXZSBzaG91bGQgbGV0 IHRoaXMgZG9jdW1lbnQgYWNjZXNzIGV2ZXJ5IG90aGVyIGRvY3VtZW50LiBUaGlzIGlzIHVzZWQg cHJpbWFyeSBieSB0ZXN0aW5nCiAgICAgICAgICAgICAvLyBoYXJuZXNzZXMgZm9yIHdlYiBzaXRl cy4KLSAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2luKCktPmdyYW50VW5pdmVyc2FsQWNjZXNzKCk7 CisgICAgICAgICAgICBzZXRTZWN1cml0eU9yaWdpbihzZWN1cml0eU9yaWdpbigpLT5zZWN1cml0 eU9yaWdpbldpdGhVbml2ZXJzYWxBY2Nlc3NHcmFudGVkKCkpOwogICAgICAgICB9IGVsc2UgaWYg KHNlY3VyaXR5T3JpZ2luKCktPmlzTG9jYWwoKSkgewogICAgICAgICAgICAgaWYgKHNldHRpbmdz LT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygpIHx8IG1fZnJhbWUtPmxvYWRlcigp LT5jbGllbnQoKS0+c2hvdWxkRm9yY2VVbml2ZXJzYWxBY2Nlc3NGcm9tTG9jYWxVUkwobV91cmwp KSB7CiAgICAgICAgICAgICAgICAgLy8gU29tZSBjbGllbnRzIHdhbnQgbG9jYWwgVVJMcyB0byBo YXZlIHVuaXZlcnNhbCBhY2Nlc3MsIGJ1dCB0aGF0IHNldHRpbmcgaXMgZGFuZ2Vyb3VzIGZvciBv dGhlciBjbGllbnRzLgotICAgICAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2luKCktPmdyYW50VW5p dmVyc2FsQWNjZXNzKCk7CisgICAgICAgICAgICAgICAgc2V0U2VjdXJpdHlPcmlnaW4oc2VjdXJp dHlPcmlnaW4oKS0+c2VjdXJpdHlPcmlnaW5XaXRoVW5pdmVyc2FsQWNjZXNzR3JhbnRlZCgpKTsK ICAgICAgICAgICAgIH0gZWxzZSBpZiAoIXNldHRpbmdzLT5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmls ZVVSTHMoKSkgewogICAgICAgICAgICAgICAgIC8vIFNvbWUgY2xpZW50cyB3YW50IGxvY2FsIFVS THMgdG8gaGF2ZSBldmVuIHRpZ2h0ZXIgcmVzdHJpY3Rpb25zIGJ5IGRlZmF1bHQsIGFuZCBub3Qg YmUgYWJsZSB0byBhY2Nlc3Mgb3RoZXIgbG9jYWwgZmlsZXMuCiAgICAgICAgICAgICAgICAgLy8g RklYTUUgODE1Nzg6IFRoZSBuYW1pbmcgb2YgdGhpcyBpcyBjb25mdXNpbmcuIEZpbGVzIHdpdGgg cmVzdHJpY3RlZCBhY2Nlc3MgdG8gb3RoZXIgbG9jYWwgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9T ZWN1cml0eU9yaWdpbi5jcHAKaW5kZXggNDdlYTFmNTZkZjE5MjI0ZjFmNTM3MzcxYjVkMjFmMDk2 NGQ0MzFjZS4uMThhMjE2YmE4YTI4MTY1MzliNDIzNTgwY2Q1ZjdlYmYxYzIzODU1NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTE1NiwxOSArMTU2LDE5IEBAIFNl Y3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbigpCiB7CiB9CiAKLVNlY3VyaXR5T3JpZ2luOjpT ZWN1cml0eU9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiogb3RoZXIpCi0gICAgOiBtX3Byb3Rv Y29sKG90aGVyLT5tX3Byb3RvY29sLmlzb2xhdGVkQ29weSgpKQotICAgICwgbV9ob3N0KG90aGVy LT5tX2hvc3QuaXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBtX2RvbWFpbihvdGhlci0+bV9kb21haW4u aXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBtX2ZpbGVQYXRoKG90aGVyLT5tX2ZpbGVQYXRoLmlzb2xh dGVkQ29weSgpKQotICAgICwgbV9wb3J0KG90aGVyLT5tX3BvcnQpCi0gICAgLCBtX2lzVW5pcXVl KG90aGVyLT5tX2lzVW5pcXVlKQotICAgICwgbV91bml2ZXJzYWxBY2Nlc3Mob3RoZXItPm1fdW5p dmVyc2FsQWNjZXNzKQotICAgICwgbV9kb21haW5XYXNTZXRJbkRPTShvdGhlci0+bV9kb21haW5X YXNTZXRJbkRPTSkKLSAgICAsIG1fY2FuTG9hZExvY2FsUmVzb3VyY2VzKG90aGVyLT5tX2Nhbkxv YWRMb2NhbFJlc291cmNlcykKLSAgICAsIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5KG90aGVyLT5t X3N0b3JhZ2VCbG9ja2luZ1BvbGljeSkKLSAgICAsIG1fZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlv bihvdGhlci0+bV9lbmZvcmNlRmlsZVBhdGhTZXBhcmF0aW9uKQotICAgICwgbV9uZWVkc0RhdGFi YXNlSWRlbnRpZmllclF1aXJrRm9yRmlsZXMob3RoZXItPm1fbmVlZHNEYXRhYmFzZUlkZW50aWZp ZXJRdWlya0ZvckZpbGVzKQorU2VjdXJpdHlPcmlnaW46OlNlY3VyaXR5T3JpZ2luKGNvbnN0IFN0 cmluZyYgcHJvdG9jb2wsIGNvbnN0IFN0cmluZyYgaG9zdCwgY29uc3QgU3RyaW5nJiBkb21haW4s IGNvbnN0IFN0cmluZyYgZmlsZVBhdGgsIHVuc2lnbmVkIHNob3J0IHBvcnQsIGJvb2wgaXNVbmlx dWUsIGJvb2wgdW5pdmVyc2FsQWNjZXNzLCBib29sIGRvbWFpbldhc1NldEluRE9NLCBib29sIGNh bkxvYWRMb2NhbFJlc291cmNlcywgU3RvcmFnZUJsb2NraW5nUG9saWN5IHN0b3JhZ2VCbG9ja2lu Z1BvbGljeSwgYm9vbCBlbmZvcmNlRmlsZVBhdGhTZXBhcmF0aW9uLCBib29sIG5lZWRzRGF0YWJh c2VJZGVudGlmaWVyUXVpcmtGb3JGaWxlcykKKyAgICA6IG1fcHJvdG9jb2wocHJvdG9jb2wpCisg ICAgLCBtX2hvc3QoaG9zdCkKKyAgICAsIG1fZG9tYWluKGRvbWFpbikKKyAgICAsIG1fZmlsZVBh dGgoZmlsZVBhdGgpCisgICAgLCBtX3BvcnQocG9ydCkKKyAgICAsIG1faXNVbmlxdWUoaXNVbmlx dWUpCisgICAgLCBtX3VuaXZlcnNhbEFjY2Vzcyh1bml2ZXJzYWxBY2Nlc3MpCisgICAgLCBtX2Rv bWFpbldhc1NldEluRE9NKGRvbWFpbldhc1NldEluRE9NKQorICAgICwgbV9jYW5Mb2FkTG9jYWxS ZXNvdXJjZXMoY2FuTG9hZExvY2FsUmVzb3VyY2VzKQorICAgICwgbV9zdG9yYWdlQmxvY2tpbmdQ b2xpY3koc3RvcmFnZUJsb2NraW5nUG9saWN5KQorICAgICwgbV9lbmZvcmNlRmlsZVBhdGhTZXBh cmF0aW9uKGVuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24pCisgICAgLCBtX25lZWRzRGF0YWJhc2VJ ZGVudGlmaWVyUXVpcmtGb3JGaWxlcyhuZWVkc0RhdGFiYXNlSWRlbnRpZmllclF1aXJrRm9yRmls ZXMpCiB7CiB9CiAKQEAgLTIwNywxMyArMjA3LDE2IEBAIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmln aW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVVbmlxdWUoKQogCiBQYXNzUmVmUHRyPFNlY3VyaXR5 T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6aXNvbGF0ZWRDb3B5KCkgY29uc3QKIHsKLSAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFNlY3VyaXR5T3JpZ2luKHRoaXMpKTsKKyAgICByZXR1cm4gYWRvcHRS ZWYobmV3IFNlY3VyaXR5T3JpZ2luKG1fcHJvdG9jb2wuaXNvbGF0ZWRDb3B5KCksIG1faG9zdC5p c29sYXRlZENvcHkoKSwgbV9kb21haW4uaXNvbGF0ZWRDb3B5KCksIG1fZmlsZVBhdGguaXNvbGF0 ZWRDb3B5KCksIG1fcG9ydCwgbV9pc1VuaXF1ZSwgbV91bml2ZXJzYWxBY2Nlc3MsIG1fZG9tYWlu V2FzU2V0SW5ET00sIG1fY2FuTG9hZExvY2FsUmVzb3VyY2VzLCBtX3N0b3JhZ2VCbG9ja2luZ1Bv bGljeSwgbV9lbmZvcmNlRmlsZVBhdGhTZXBhcmF0aW9uLCBtX25lZWRzRGF0YWJhc2VJZGVudGlm aWVyUXVpcmtGb3JGaWxlcykpOwogfQogCi12b2lkIFNlY3VyaXR5T3JpZ2luOjpzZXREb21haW5G cm9tRE9NKGNvbnN0IFN0cmluZyYgbmV3RG9tYWluKQorUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdp bj4gU2VjdXJpdHlPcmlnaW46OnNlY3VyaXR5T3JpZ2luV2l0aERvbWFpblNldEZyb21ET00oY29u c3QgU3RyaW5nJiBuZXdEb21haW4pIGNvbnN0CiB7Ci0gICAgbV9kb21haW5XYXNTZXRJbkRPTSA9 IHRydWU7Ci0gICAgbV9kb21haW4gPSBuZXdEb21haW4ubG93ZXIoKTsKKyAgICBTdHJpbmcgZG9t YWluID0gbmV3RG9tYWluLmxvd2VyKCk7CisgICAgaWYgKG1fZG9tYWluV2FzU2V0SW5ET00gJiYg bV9kb21haW4gPT0gZG9tYWluKQorICAgICAgICByZXR1cm4gY29uc3RfY2FzdDxTZWN1cml0eU9y aWdpbio+KHRoaXMpOworCisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZWN1cml0eU9yaWdpbiht X3Byb3RvY29sLCBtX2hvc3QsIGRvbWFpbiwgbV9maWxlUGF0aCwgbV9wb3J0LCBtX2lzVW5pcXVl LCBtX3VuaXZlcnNhbEFjY2VzcywgbV9kb21haW5XYXNTZXRJbkRPTSwgbV9jYW5Mb2FkTG9jYWxS ZXNvdXJjZXMsIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5LCBtX2VuZm9yY2VGaWxlUGF0aFNlcGFy YXRpb24sIG1fbmVlZHNEYXRhYmFzZUlkZW50aWZpZXJRdWlya0ZvckZpbGVzKSk7CiB9CiAKIGJv b2wgU2VjdXJpdHlPcmlnaW46OmlzU2VjdXJlKGNvbnN0IEtVUkwmIHVybCkKQEAgLTQzNCw5ICs0 MzcsMTIgQEAgdm9pZCBTZWN1cml0eU9yaWdpbjo6Z3JhbnRMb2FkTG9jYWxSZXNvdXJjZXMoKQog ICAgIG1fY2FuTG9hZExvY2FsUmVzb3VyY2VzID0gdHJ1ZTsKIH0KIAotdm9pZCBTZWN1cml0eU9y aWdpbjo6Z3JhbnRVbml2ZXJzYWxBY2Nlc3MoKQorUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4g U2VjdXJpdHlPcmlnaW46OnNlY3VyaXR5T3JpZ2luV2l0aFVuaXZlcnNhbEFjY2Vzc0dyYW50ZWQo KSBjb25zdAogewotICAgIG1fdW5pdmVyc2FsQWNjZXNzID0gdHJ1ZTsKKyAgICBpZiAobV91bml2 ZXJzYWxBY2Nlc3MpCisgICAgICAgIHJldHVybiBjb25zdF9jYXN0PFNlY3VyaXR5T3JpZ2luKj4o dGhpcyk7CisKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNlY3VyaXR5T3JpZ2luKG1fcHJvdG9j b2wsIG1faG9zdCwgbV9kb21haW4sIG1fZmlsZVBhdGgsIG1fcG9ydCwgbV9pc1VuaXF1ZSwgdHJ1 ZSwgbV9kb21haW5XYXNTZXRJbkRPTSwgbV9jYW5Mb2FkTG9jYWxSZXNvdXJjZXMsIG1fc3RvcmFn ZUJsb2NraW5nUG9saWN5LCBtX2VuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24sIG1fbmVlZHNEYXRh YmFzZUlkZW50aWZpZXJRdWlya0ZvckZpbGVzKSk7CiB9CiAKICNpZiBFTkFCTEUoQ0FDSEVfUEFS VElUSU9OSU5HKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdp bi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCmluZGV4IDNmY2Q4N2Nh ODEyM2RkZWQzN2UxNDQwYzNiZjRkZGJkOWI2ZGZiNGUuLmY2ZjNjODg5MGZmMTc2NGQzYzZkYzBh MDRiYzliNjM1YTE5YjdhNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJp dHlPcmlnaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAg LTc0LDEwICs3NCwxMCBAQCBwdWJsaWM6CiAgICAgLy8gd2hlbiBtYXJzaGFsbGluZyBhIFNlY3Vy aXR5T3JpZ2luIHRvIGFub3RoZXIgdGhyZWFkLgogICAgIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmln aW4+IGlzb2xhdGVkQ29weSgpIGNvbnN0OwogCi0gICAgLy8gU2V0IHRoZSBkb21haW4gcHJvcGVy dHkgb2YgdGhpcyBzZWN1cml0eSBvcmlnaW4gdG8gbmV3RG9tYWluLiBUaGlzCisgICAgLy8gQ3Jl YXRlIGEgbmV3IHNlY3VyaXR5IG9yaWdpbiB3aXRoIHRoZSBkb21haW4gcHJvcGVydHkgc2V0IHRv IG5ld0RvbWFpbi4gVGhpcwogICAgIC8vIGZ1bmN0aW9uIGRvZXMgbm90IGNoZWNrIHdoZXRoZXIg bmV3RG9tYWluIGlzIGEgc3VmZml4IG9mIHRoZSBjdXJyZW50CiAgICAgLy8gZG9tYWluLiBUaGUg Y2FsbGVyIGlzIHJlc3BvbnNpYmxlIGZvciB2YWxpZGF0aW5nIG5ld0RvbWFpbi4KLSAgICB2b2lk IHNldERvbWFpbkZyb21ET00oY29uc3QgU3RyaW5nJiBuZXdEb21haW4pOworICAgIFBhc3NSZWZQ dHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luV2l0aERvbWFpblNldEZyb21ET00oY29u c3QgU3RyaW5nJiBuZXdEb21haW4pIGNvbnN0OwogICAgIGJvb2wgZG9tYWluV2FzU2V0SW5ET00o KSBjb25zdCB7IHJldHVybiBtX2RvbWFpbldhc1NldEluRE9NOyB9CiAKICAgICBTdHJpbmcgcHJv dG9jb2woKSBjb25zdCB7IHJldHVybiBtX3Byb3RvY29sOyB9CkBAIC0xMzcsNyArMTM3LDcgQEAg cHVibGljOgogICAgIC8vIEV4cGxpY2l0bHkgZ3JhbnQgdGhlIGFiaWxpdHkgdG8gYWNjZXNzIHZl cnkgb3RoZXIgU2VjdXJpdHlPcmlnaW4uCiAgICAgLy8KICAgICAvLyBXQVJOSU5HOiBUaGlzIGlz IGFuIGV4dHJlbWVseSBwb3dlcmZ1bCBhYmlsaXR5LiBVc2Ugd2l0aCBjYXV0aW9uIQotICAgIHZv aWQgZ3JhbnRVbml2ZXJzYWxBY2Nlc3MoKTsKKyAgICBQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiBzZWN1cml0eU9yaWdpbldpdGhVbml2ZXJzYWxBY2Nlc3NHcmFudGVkKCkgY29uc3Q7CiAKICAg ICB2b2lkIHNldFN0b3JhZ2VCbG9ja2luZ1BvbGljeShTdG9yYWdlQmxvY2tpbmdQb2xpY3kgcG9s aWN5KSB7IG1fc3RvcmFnZUJsb2NraW5nUG9saWN5ID0gcG9saWN5OyB9CiAKQEAgLTIxNSw2ICsy MTUsNyBAQCBwcml2YXRlOgogICAgIFNlY3VyaXR5T3JpZ2luKCk7CiAgICAgZXhwbGljaXQgU2Vj dXJpdHlPcmlnaW4oY29uc3QgS1VSTCYpOwogICAgIGV4cGxpY2l0IFNlY3VyaXR5T3JpZ2luKGNv bnN0IFNlY3VyaXR5T3JpZ2luKik7CisgICAgU2VjdXJpdHlPcmlnaW4oY29uc3QgU3RyaW5nJiBw cm90b2NvbCwgY29uc3QgU3RyaW5nJiBob3N0LCBjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3Qg U3RyaW5nJiBmaWxlUGF0aCwgdW5zaWduZWQgc2hvcnQgcG9ydCwgYm9vbCBpc1VuaXF1ZSwgYm9v bCB1bml2ZXJzYWxBY2Nlc3MsIGJvb2wgZG9tYWluV2FzU2V0SW5ET00sIGJvb2wgY2FuTG9hZExv Y2FsUmVzb3VyY2VzLCBTdG9yYWdlQmxvY2tpbmdQb2xpY3ksIGJvb2wgZW5mb3JjZUZpbGVQYXRo U2VwYXJhdGlvbiwgYm9vbCBuZWVkc0RhdGFiYXNlSWRlbnRpZmllclF1aXJrRm9yRmlsZXMpOwog CiAgICAgLy8gRklYTUU6IFJlbmFtZSB0aGlzIGZ1bmN0aW9uIHRvIHNvbWV0aGluZyBtb3JlIHNl bWFudGljLgogICAgIGJvb2wgcGFzc2VzRmlsZUNoZWNrKGNvbnN0IFNlY3VyaXR5T3JpZ2luKikg Y29uc3Q7Cg==