69294 2011-10-03 14:53:51 -0700 Move ContentSecurityPolicy to the ScriptExecutionContext to prepare it for working with XHR and workers 2011-10-03 15:34:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 477259 0 sam 2011-10-03 14:53:51 -0700 Move ContentSecurityPolicy to the ScriptExecutionContext to prepare it for working with XHR and workers 477269 1 109535 sam 2011-10-03 15:01:22 -0700 Created attachment 109535 Patch 477273 2 109535 darin 2011-10-03 15:08:31 -0700 Comment on attachment 109535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109535&action=review > Source/WebCore/dom/ScriptExecutionContext.h:178 > // Note: It is dangerous to change the security origin of a script context > // that already contains content. > void setSecurityOrigin(PassRefPtr<SecurityOrigin>); > + void setContentSecurityPolicy(PassRefPtr<ContentSecurityPolicy>); Paragraphing here is a little strange since the comment above is about the security origin, not the content security policy. 477274 3 109535 abarth 2011-10-03 15:08:45 -0700 Comment on attachment 109535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109535&action=review > Source/WebCore/workers/WorkerContext.cpp:120 > + // FIXME: This should probably adopt the ContentSecurityPolicy of the document > + // that created this worker. There was some discussion about this in the working group. The other choice is to use the header that comes with the script. 477292 4 sam 2011-10-03 15:34:31 -0700 Committed r96550: <http://trac.webkit.org/changeset/96550> 109535 2011-10-03 15:01:22 -0700 2011-10-03 15:08:45 -0700 Patch bug-69294-20111003150121.patch text/plain 11921 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NTQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTEtMTAtMDMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBNb3ZlIENvbnRlbnRTZWN1cml0eVBvbGlj eSB0byB0aGUgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCB0byBwcmVwYXJlIGl0IGZvciB3b3JraW5n IHdpdGggWEhSIGFuZCB3b3JrZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KToKKyAgICAgICAgSW5pdGlhbGl6ZSB0aGUgQ29udGVu dFNlY3VyaXR5UG9saWN5IGJ5IGNhbGxpbmcgZG93biB0byB0aGUgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dC4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICBNb3ZlIHRoZSBDb250 ZW50U2VjdXJpdHlQb2xpY3kgbWVtYmVyIGFuZCBnZXR0ZXIgZnJvbSBoZXJlIHRvIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuaC4KKworICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnNldENvbnRl bnRTZWN1cml0eVBvbGljeSk6CisgICAgICAgICogZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OmNvbnRlbnRTZWN1 cml0eVBvbGljeSk6CisgICAgICAgIEFkZCBDb250ZW50U2VjdXJpdHlQb2xpY3kgbWVtYmVyIGFu ZCBnZXR0ZXIvc2V0dGVyLgorCisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3ku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2Vj dXJpdHlQb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5Ojpk aWRSZWNlaXZlSGVhZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGlj eTo6cmVwb3J0VmlvbGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBv bGljeTo6cGFyc2VSZXBvcnRVUkkpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5 UG9saWN5OjpjcmVhdGVDU1BEaXJlY3RpdmUpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5Lmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmNy ZWF0ZSk6CisgICAgICAgIFJlcGxhY2UgRG9jdW1lbnQgd2l0aCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0LiBBZGQgdGVtcG9yYXJ5IGNoZWNrZWQgY2FzdHMgdG8gZG9jdW1lbnQKKyAgICAgICAgd2hl cmUgbmVjZXNzYXJ5LgorCisgICAgICAgICogd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OldvcmtlckNvbnRleHQ6OldvcmtlckNvbnRleHQpOgorICAgICAgICBB ZGQgaW5pdGlhbGl6YXRpb24gb2YgdGhlIENvbnRlbnRTZWN1cml0eVBvbGljeS4KKwogMjAxMS0x MC0wMyAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IHJnYigpIHdpdGggcGVyY2VudGFnZXMgc2hvd3Mgd3JvbmcgaGV4L2hzbCB2 YWx1ZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gOTY1MzcpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTAyLDcg KzQ1MDIsNyBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKICAgICAgICAg Ly8gVGhpcyBjYW4gb2NjdXIgdmlhIGRvY3VtZW50LmltcGxlbWVudGF0aW9uLmNyZWF0ZURvY3Vt ZW50KCkuCiAgICAgICAgIG1fY29va2llVVJMID0gS1VSTChQYXJzZWRVUkxTdHJpbmcsICIiKTsK ICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6c2V0U2VjdXJpdHlPcmlnaW4oU2VjdXJp dHlPcmlnaW46OmNyZWF0ZUVtcHR5KCkpOwotICAgICAgICBtX2NvbnRlbnRTZWN1cml0eVBvbGlj eSA9IENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y3JlYXRlKHRoaXMpOworICAgICAgICBTY3JpcHRF eGVjdXRpb25Db250ZXh0OjpzZXRDb250ZW50U2VjdXJpdHlQb2xpY3koQ29udGVudFNlY3VyaXR5 UG9saWN5OjpjcmVhdGUodGhpcykpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00NTEw LDcgKzQ1MTAsNyBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKICAgICAv LyBsb2FkaW5nIFVSTCB3aXRoIGEgZnJlc2ggY29udGVudCBzZWN1cml0eSBwb2xpY3kuCiAgICAg bV9jb29raWVVUkwgPSBtX3VybDsKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzZXRTZWN1 cml0eU9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG1fdXJsLCBtX2ZyYW1lLT5sb2FkZXIo KS0+c2FuZGJveEZsYWdzKCkpKTsKLSAgICBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSA9IENvbnRl bnRTZWN1cml0eVBvbGljeTo6Y3JlYXRlKHRoaXMpOworICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQ6OnNldENvbnRlbnRTZWN1cml0eVBvbGljeShDb250ZW50U2VjdXJpdHlQb2xpY3k6OmNyZWF0 ZSh0aGlzKSk7CiAKICAgICBpZiAoU2VjdXJpdHlPcmlnaW46OmFsbG93U3Vic3RpdHV0ZURhdGFB Y2Nlc3NUb0xvY2FsKCkpIHsKICAgICAgICAgLy8gSWYgdGhpcyBkb2N1bWVudCB3YXMgbG9hZGVk IHdpdGggc3Vic3RpdHV0ZURhdGEsIHRoZW4gdGhlIGRvY3VtZW50IGNhbgpAQCAtNDU1Nyw3ICs0 NTU3LDcgQEAgdm9pZCBEb2N1bWVudDo6aW5pdFNlY3VyaXR5Q29udGV4dCgpCiAgICAgICAgIC8v IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMxMwogICAgICAgICBT Y3JpcHRFeGVjdXRpb25Db250ZXh0OjpzZXRTZWN1cml0eU9yaWdpbihvd25lckZyYW1lLT5kb2N1 bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKTsKICAgICAgICAgLy8gRklYTUU6IENvbnNpZGVyIG1v dmluZyBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSBpbnRvIFNlY3VyaXR5T3JpZ2luLgotICAgICAg ICBtX2NvbnRlbnRTZWN1cml0eVBvbGljeSA9IG93bmVyRnJhbWUtPmRvY3VtZW50KCktPmNvbnRl bnRTZWN1cml0eVBvbGljeSgpOworICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzZXRD b250ZW50U2VjdXJpdHlQb2xpY3kob3duZXJGcmFtZS0+ZG9jdW1lbnQoKS0+Y29udGVudFNlY3Vy aXR5UG9saWN5KCkpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHJldmlz aW9uIDk2NTM3KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTY1LDcgKzY1LDYgQEAgY2xhc3MgQ2FjaGVkU2NyaXB0OwogY2xhc3MgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDsKIGNsYXNzIENoYXJhY3RlckRhdGE7CiBjbGFzcyBDb21tZW50OwotY2xh c3MgQ29udGVudFNlY3VyaXR5UG9saWN5OwogY2xhc3MgRE9NSW1wbGVtZW50YXRpb247CiBjbGFz cyBET01TZWxlY3Rpb247CiBjbGFzcyBET01XaW5kb3c7CkBAIC0xMDkyLDggKzEwOTEsNiBAQCBw dWJsaWM6CiAKICAgICB2b2lkIGluaXRETlNQcmVmZXRjaCgpOwogCi0gICAgQ29udGVudFNlY3Vy aXR5UG9saWN5KiBjb250ZW50U2VjdXJpdHlQb2xpY3koKSB7IHJldHVybiBtX2NvbnRlbnRTZWN1 cml0eVBvbGljeS5nZXQoKTsgfQotCiAgICAgdW5zaWduZWQgd2hlZWxFdmVudEhhbmRsZXJDb3Vu dCgpIGNvbnN0IHsgcmV0dXJuIG1fd2hlZWxFdmVudEhhbmRsZXJDb3VudDsgfQogICAgIHZvaWQg ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIoKTsKICAgICB2b2lkIGRpZFJlbW92ZVdoZWVsRXZlbnRI YW5kbGVyKCk7CkBAIC0xNDA2LDggKzE0MDMsNiBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShSRVFV RVNUX0FOSU1BVElPTl9GUkFNRSkKICAgICBPd25QdHI8U2NyaXB0ZWRBbmltYXRpb25Db250cm9s bGVyPiBtX3NjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlcjsKICNlbmRpZgotCi0gICAgUmVmUHRy PENvbnRlbnRTZWN1cml0eVBvbGljeT4gbV9jb250ZW50U2VjdXJpdHlQb2xpY3k7CiB9OwogCiAv LyBQdXQgdGhlc2UgbWV0aG9kcyBoZXJlLCBiZWNhdXNlIHRoZXkgcmVxdWlyZSB0aGUgRG9jdW1l bnQgZGVmaW5pdGlvbiwgYnV0IHdlIHJlYWxseSB3YW50IHRvIGlubGluZSB0aGVtLgpJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAkocmV2aXNp b24gOTY1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJBY3RpdmVET01P YmplY3QuaCIKICNpbmNsdWRlICJCbG9iLmgiCiAjaW5jbHVkZSAiQmxvYlVSTC5oIgorI2luY2x1 ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUgIkRPTVRpbWVyLmgiCiAjaW5j bHVkZSAiRE9NVVJMLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2UuaCIKQEAgLTMxNSw2ICszMTYsMTEg QEAgdm9pZCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpzZXRTZWN1cml0eQogICAgIG1fc2VjdXJp dHlPcmlnaW4gPSBzZWN1cml0eU9yaWdpbjsKIH0KIAordm9pZCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0OjpzZXRDb250ZW50U2VjdXJpdHlQb2xpY3koUGFzc1JlZlB0cjxDb250ZW50U2VjdXJpdHlQ b2xpY3k+IGNvbnRlbnRTZWN1cml0eVBvbGljeSkKK3sKKyAgICBtX2NvbnRlbnRTZWN1cml0eVBv bGljeSA9IGNvbnRlbnRTZWN1cml0eVBvbGljeTsKK30KKwogYm9vbCBTY3JpcHRFeGVjdXRpb25D b250ZXh0OjpzYW5pdGl6ZVNjcmlwdEVycm9yKFN0cmluZyYgZXJyb3JNZXNzYWdlLCBpbnQmIGxp bmVOdW1iZXIsIFN0cmluZyYgc291cmNlVVJMKQogewogICAgIEtVUkwgdGFyZ2V0VVJMID0gY29t cGxldGVVUkwoc291cmNlVVJMKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVj dXRpb25Db250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuaAkocmV2aXNpb24gOTY1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20v U2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBA CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBjbGFzcyBCbG9iOworICAgIGNsYXNzIENvbnRl bnRTZWN1cml0eVBvbGljeTsKICAgICBjbGFzcyBET01UaW1lcjsKICAgICBjbGFzcyBET01VUkw7 CiAgICAgY2xhc3MgRXZlbnRMaXN0ZW5lcjsKQEAgLTk2LDYgKzk3LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2aXJ0dWFsIFN0cmluZyB1c2VyQWdlbnQoY29uc3QgS1VSTCYpIGNv bnN0ID0gMDsKIAogICAgICAgICBTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4oKSBjb25z dCB7IHJldHVybiBtX3NlY3VyaXR5T3JpZ2luLmdldCgpOyB9CisgICAgICAgIENvbnRlbnRTZWN1 cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5UG9saWN5KCkgeyByZXR1cm4gbV9jb250ZW50U2Vj dXJpdHlQb2xpY3kuZ2V0KCk7IH0KIAogICAgICAgICBib29sIHNhbml0aXplU2NyaXB0RXJyb3Io U3RyaW5nJiBlcnJvck1lc3NhZ2UsIGludCYgbGluZU51bWJlciwgU3RyaW5nJiBzb3VyY2VVUkwp OwogICAgICAgICB2b2lkIHJlcG9ydEV4Y2VwdGlvbihjb25zdCBTdHJpbmcmIGVycm9yTWVzc2Fn ZSwgaW50IGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMLCBQYXNzUmVmUHRyPFNj cmlwdENhbGxTdGFjaz4pOwpAQCAtMTczLDYgKzE3NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgLy8gTm90ZTogSXQgaXMgZGFuZ2Vyb3VzIHRvIGNoYW5nZSB0aGUgc2VjdXJpdHkg b3JpZ2luIG9mIGEgc2NyaXB0IGNvbnRleHQKICAgICAgICAgLy8gICAgICAgdGhhdCBhbHJlYWR5 IGNvbnRhaW5zIGNvbnRlbnQuCiAgICAgICAgIHZvaWQgc2V0U2VjdXJpdHlPcmlnaW4oUGFzc1Jl ZlB0cjxTZWN1cml0eU9yaWdpbj4pOworICAgICAgICB2b2lkIHNldENvbnRlbnRTZWN1cml0eVBv bGljeShQYXNzUmVmUHRyPENvbnRlbnRTZWN1cml0eVBvbGljeT4pOwogCiAgICAgcHJpdmF0ZToK ICAgICAgICAgdmlydHVhbCBjb25zdCBLVVJMJiB2aXJ0dWFsVVJMKCkgY29uc3QgPSAwOwpAQCAt MTg1LDYgKzE4OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBjbG9zZU1l c3NhZ2VQb3J0cygpOwogCiAgICAgICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9zZWN1cml0 eU9yaWdpbjsKKyAgICAgICAgUmVmUHRyPENvbnRlbnRTZWN1cml0eVBvbGljeT4gbV9jb250ZW50 U2VjdXJpdHlQb2xpY3k7CiAKICAgICAgICAgSGFzaFNldDxNZXNzYWdlUG9ydCo+IG1fbWVzc2Fn ZVBvcnRzOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGlj eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQ b2xpY3kuY3BwCShyZXZpc2lvbiA5NjUzNykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYzLDkgKzQ2Myw5IEBAIHBy aXZhdGU6CiAgICAgU3RyaW5nIG1fdGV4dDsKIH07CiAKLUNvbnRlbnRTZWN1cml0eVBvbGljeTo6 Q29udGVudFNlY3VyaXR5UG9saWN5KERvY3VtZW50KiBkb2N1bWVudCkKK0NvbnRlbnRTZWN1cml0 eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQpCiAgICAgOiBtX2hhdmVQb2xpY3koZmFsc2UpCi0gICAgLCBt X2RvY3VtZW50KGRvY3VtZW50KQorICAgICwgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KHNjcmlw dEV4ZWN1dGlvbkNvbnRleHQpCiAgICAgLCBtX3JlcG9ydE9ubHkoZmFsc2UpCiB7CiB9CkBAIC00 OTIsMTQgKzQ5MiwyMiBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6ZGlkUmVjZWl2ZUhl CiAgICAgfQogCiAgICAgaWYgKCFjaGVja0V2YWwob3BlcmF0aXZlRGlyZWN0aXZlKG1fc2NyaXB0 U3JjLmdldCgpKSkpIHsKLSAgICAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IG1fZG9jdW1lbnQtPmZy YW1lKCkpCi0gICAgICAgICAgICBmcmFtZS0+c2NyaXB0KCktPmRpc2FibGVFdmFsKCk7CisgICAg ICAgIC8vIEZJWE1FOiBTdXBwb3J0IGRpc2FibGluZyBldmFsIGZvciBXb3JrZXJzLgorICAgICAg ICBpZiAobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5pc0RvY3VtZW50KCkpIHsKKyAgICAgICAg ICAgIGlmIChGcmFtZSogZnJhbWUgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG1fc2NyaXB0RXhl Y3V0aW9uQ29udGV4dCktPmZyYW1lKCkpCisgICAgICAgICAgICAgICAgZnJhbWUtPnNjcmlwdCgp LT5kaXNhYmxlRXZhbCgpOworICAgICAgICB9CiAgICAgfQogfQogCiB2b2lkIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6cmVwb3J0VmlvbGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0aXZlVGV4dCwg Y29uc3QgU3RyaW5nJiBjb25zb2xlTWVzc2FnZSkgY29uc3QKIHsKLSAgICBGcmFtZSogZnJhbWUg PSBtX2RvY3VtZW50LT5mcmFtZSgpOworICAgIC8vIEZJWE1FOiBTdXBwb3J0IHJlcG9ydGluZyB2 aW9sYXRpb25zIGZvciBXb3JrZXJzLgorICAgIGlmICghbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0 LT5pc0RvY3VtZW50KCkpCisgICAgICAgIHJldHVybjsKKworICAgIERvY3VtZW50KiBkb2N1bWVu dCA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKKyAg ICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAg ICAgICByZXR1cm47CiAKQEAgLTUyMCw3ICs1MjgsNyBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBv bGljeTo6cmVwb3J0VmlvbGF0CiAgICAgLy8gaGFybWxlc3MgaW5mb3JtYXRpb24uCiAKICAgICBG b3JtRGF0YUxpc3QgcmVwb3J0TGlzdChVVEY4RW5jb2RpbmcoKSk7Ci0gICAgcmVwb3J0TGlzdC5h cHBlbmREYXRhKCJkb2N1bWVudC11cmwiLCBtX2RvY3VtZW50LT51cmwoKSk7CisgICAgcmVwb3J0 TGlzdC5hcHBlbmREYXRhKCJkb2N1bWVudC11cmwiLCBkb2N1bWVudC0+dXJsKCkpOwogICAgIGlm ICghZGlyZWN0aXZlVGV4dC5pc0VtcHR5KCkpCiAgICAgICAgIHJlcG9ydExpc3QuYXBwZW5kRGF0 YSgidmlvbGF0ZWQtZGlyZWN0aXZlIiwgZGlyZWN0aXZlVGV4dCk7CiAKQEAgLTcyMCwxNCArNzI4 LDE0IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpwYXJzZVJlcG9ydFUKIAogICAgICAg ICBpZiAodXJsQmVnaW4gPCBwb3NpdGlvbikgewogICAgICAgICAgICAgU3RyaW5nIHVybCA9IFN0 cmluZyh1cmxCZWdpbiwgcG9zaXRpb24gLSB1cmxCZWdpbik7Ci0gICAgICAgICAgICBtX3JlcG9y dFVSTHMuYXBwZW5kKG1fZG9jdW1lbnQtPmNvbXBsZXRlVVJMKHVybCkpOworICAgICAgICAgICAg bV9yZXBvcnRVUkxzLmFwcGVuZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmNvbXBsZXRlVVJM KHVybCkpOwogICAgICAgICB9CiAgICAgfQogfQogCiBQYXNzT3duUHRyPENTUERpcmVjdGl2ZT4g Q29udGVudFNlY3VyaXR5UG9saWN5OjpjcmVhdGVDU1BEaXJlY3RpdmUoY29uc3QgU3RyaW5nJiBu YW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgQ1NQ RGlyZWN0aXZlKG5hbWUsIHZhbHVlLCBtX2RvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpKSk7Cisg ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBDU1BEaXJlY3RpdmUobmFtZSwgdmFsdWUsIG1fc2NyaXB0 RXhlY3V0aW9uQ29udGV4dC0+c2VjdXJpdHlPcmlnaW4oKSkpOwogfQogCiB2b2lkIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3Ry aW5nJiB2YWx1ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9s aWN5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQ b2xpY3kuaAkocmV2aXNpb24gOTY1MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRT ZWN1cml0eVBvbGljeS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwxNCArMzIsMTQgQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQ1NQRGlyZWN0aXZlOwotY2xhc3MgRG9jdW1lbnQ7Citj bGFzcyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OwogY2xhc3MgS1VSTDsKIAogY2xhc3MgQ29udGVu dFNlY3VyaXR5UG9saWN5IDogcHVibGljIFJlZkNvdW50ZWQ8Q29udGVudFNlY3VyaXR5UG9saWN5 PiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8Q29udGVudFNlY3VyaXR5UG9saWN5 PiBjcmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50KQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPENvbnRl bnRTZWN1cml0eVBvbGljeT4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENvbnRl bnRTZWN1cml0eVBvbGljeShkb2N1bWVudCkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IENvbnRlbnRTZWN1cml0eVBvbGljeShzY3JpcHRFeGVjdXRpb25Db250ZXh0KSk7CiAgICAgfQog ICAgIH5Db250ZW50U2VjdXJpdHlQb2xpY3koKTsKIApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBhbGxvd01lZGlhRnJvbVNvdXJjZShjb25zdCBLVVJMJikgY29uc3Q7CiAKIHBy aXZhdGU6Ci0gICAgZXhwbGljaXQgQ29udGVudFNlY3VyaXR5UG9saWN5KERvY3VtZW50Kik7Cisg ICAgZXhwbGljaXQgQ29udGVudFNlY3VyaXR5UG9saWN5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQq KTsKIAogICAgIHZvaWQgcGFyc2UoY29uc3QgU3RyaW5nJik7CiAgICAgYm9vbCBwYXJzZURpcmVj dGl2ZShjb25zdCBVQ2hhciogYmVnaW4sIGNvbnN0IFVDaGFyKiBlbmQsIFN0cmluZyYgbmFtZSwg U3RyaW5nJiB2YWx1ZSk7CkBAIC04NSw3ICs4NSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBkZW55 SWZFbmZvcmNpbmdQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX3JlcG9ydE9ubHk7IH0KIAogICAg IGJvb2wgbV9oYXZlUG9saWN5OwotICAgIERvY3VtZW50KiBtX2RvY3VtZW50OworICAgIFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dDsKIAogICAgIGJvb2wg bV9yZXBvcnRPbmx5OwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fZGVmYXVsdFNyYzsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29udGV4dC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcAkocmV2aXNpb24gOTY1 MzcpCisrKyBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJBYnN0cmFjdERhdGFiYXNlLmgi CiAjaW5jbHVkZSAiQWN0aXZlRE9NT2JqZWN0LmgiCisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5 UG9saWN5LmgiCiAjaW5jbHVkZSAiRGF0YWJhc2UuaCIKICNpbmNsdWRlICJEYXRhYmFzZUNhbGxi YWNrLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VTeW5jLmgiCkBAIC0xMTQsNiArMTE1LDEwIEBAIFdv cmtlckNvbnRleHQ6OldvcmtlckNvbnRleHQoY29uc3QgS1VSTCYKICAgICAsIG1fY2xvc2luZyhm YWxzZSkKIHsKICAgICBzZXRTZWN1cml0eU9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVy bCkpOworICAgIAorICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBhZG9wdCB0aGUg Q29udGVudFNlY3VyaXR5UG9saWN5IG9mIHRoZSBkb2N1bWVudAorICAgIC8vIHRoYXQgY3JlYXRl ZCB0aGlzIHdvcmtlci4gCisgICAgc2V0Q29udGVudFNlY3VyaXR5UG9saWN5KENvbnRlbnRTZWN1 cml0eVBvbGljeTo6Y3JlYXRlKHRoaXMpKTsKIH0KIAogV29ya2VyQ29udGV4dDo6fldvcmtlckNv bnRleHQoKQo=