57283 2011-03-28 16:13:02 -0700 CSP object-src should block plugin loads 2011-04-06 21:44:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53572 1 abarth abarth commit-queue eric oldest_to_newest 374871 0 abarth 2011-03-28 16:13:02 -0700 CSP object-src should block plugin loads 374872 1 87235 abarth 2011-03-28 16:14:06 -0700 Created attachment 87235 Work in progress 374873 2 abarth 2011-03-28 16:14:32 -0700 I need to figure out how to test this patch. 379366 3 88188 abarth 2011-04-05 00:46:44 -0700 Created attachment 88188 Patch 380535 4 88188 eric 2011-04-06 10:13:23 -0700 Comment on attachment 88188 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88188&action=review Seems reasonable. THank you. > Source/WebCore/loader/DocumentWriter.cpp:124 > + // FIXME: Do we need to consult the content security policy here about blocked plug-ins? How might we hit this case? 380560 5 abarth 2011-04-06 10:24:18 -0700 (In reply to comment #4) > (From update of attachment 88188 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=88188&action=review > > Seems reasonable. THank you. > > > Source/WebCore/loader/DocumentWriter.cpp:124 > > + // FIXME: Do we need to consult the content security policy here about blocked plug-ins? > > How might we hit this case? I think: <iframe src="... plugin ..." > I need to study it more. 380647 6 88188 commit-queue 2011-04-06 11:14:08 -0700 Comment on attachment 88188 Patch Rejecting attachment 88188 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'land-a..." exit_code: 2 Last 500 characters of output: rocess/InjectedBundle/API/c/WKBundle.cpp M Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h M Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl M Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp M Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h M Tools/ChangeLog r83071 = 1c223216c59c4d4ca60248eb86830155cbe81c37 (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Full output: http://queues.webkit.org/results/8347285 381118 7 88188 abarth 2011-04-06 21:43:54 -0700 Comment on attachment 88188 Patch Clearing flags on attachment: 88188 Committed r83141: <http://trac.webkit.org/changeset/83141> 381119 8 abarth 2011-04-06 21:44:00 -0700 All reviewed patches have been landed. Closing bug. 87235 2011-03-28 16:14:06 -0700 2011-04-05 00:46:41 -0700 Work in progress bug-57283-20110328161404.patch text/plain 4841 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMjggIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDU1Agb2JqZWN0LXNyYyBzaG91bGQgYmxvY2sgcGx1Z2luIGxvYWRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI4Mwor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogbG9hZGVyL0RvY3Vt ZW50V3JpdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50V3JpdGVyOjpiZWdpbik6 CisgICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlN1YmZyYW1lTG9hZGVyOjpyZXF1ZXN0UGx1Z2luKToKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRT ZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xp Y3k6OmFsbG93T2JqZWN0RnJvbVNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2Vj dXJpdHlQb2xpY3k6OmFkZERpcmVjdGl2ZSk6CisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJp dHlQb2xpY3kuaDoKKwogMjAxMS0wMy0yOCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSUz1Ub255IENoYW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50V3JpdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRXcml0ZXIuY3BwCShyZXZpc2lvbiA4MjE0NikKKysrIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw2ICsxMjEs OSBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpiZWdpbihjb25zdCBLVVJMJiB1CiAgICAgaWYgKGRv Y3VtZW50LT5pc1BsdWdpbkRvY3VtZW50KCkgJiYgbV9mcmFtZS0+bG9hZGVyKCktPmlzU2FuZGJv eGVkKFNhbmRib3hQbHVnaW5zKSkKICAgICAgICAgZG9jdW1lbnQgPSBTaW5rRG9jdW1lbnQ6OmNy ZWF0ZShtX2ZyYW1lLCB1cmwpOwogCisgICAgLy8gT09QUzogQWRkIGEgdGVzdCBmb3IgdGhpcyBj YXNlISBJIGRvbid0IHRoaW5rIHRoZSBjb2RlIGFib3ZlIHdhcyB0aGUgY29ycmVjdCBmaXggZm9y CisgICAgLy8gYnVnIDM5MzIzLiBJdCBzZWVtcyB0byBvbmx5IGhhbmRsZSBzb21lIG9mIHRoZSBy ZWFzb25zIHBsdWctaW5zIG1pZ2h0IGJlIGJsb2NrZWQuCisKICAgICBib29sIHJlc2V0U2NyaXB0 aW5nID0gIShtX2ZyYW1lLT5sb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmlzRGlzcGxheWluZ0lu aXRpYWxFbXB0eURvY3VtZW50KCkgJiYgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmln aW4oKS0+aXNTZWN1cmVUcmFuc2l0aW9uVG8odXJsKSk7CiAgICAgbV9mcmFtZS0+bG9hZGVyKCkt PmNsZWFyKHJlc2V0U2NyaXB0aW5nLCByZXNldFNjcmlwdGluZyk7CiAgICAgY2xlYXIoKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gODIx NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAi U3ViZnJhbWVMb2FkZXIuaCIKIAorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbmNs dWRlICJIVE1MQXBwbGV0RWxlbWVudC5oIgpAQCAtMTA5LDggKzExMCwxMiBAQCBib29sIFN1YmZy YW1lTG9hZGVyOjpyZXF1ZXN0UGx1Z2luKEhUTUxQCiAgICAgICAgIHx8ICghc2V0dGluZ3MtPmlz SmF2YUVuYWJsZWQoKSAmJiBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0phdmFBcHBsZXRNSU1FVHlwZSht aW1lVHlwZSkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9mcmFtZS0+ZG9j dW1lbnQoKSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5pc1NhbmRi b3hlZChTYW5kYm94UGx1Z2lucykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAobV9m cmFtZS0+ZG9jdW1lbnQoKSkgeworICAgICAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2Vj dXJpdHlPcmlnaW4oKS0+aXNTYW5kYm94ZWQoU2FuZGJveFBsdWdpbnMpKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIW1fZnJhbWUtPmRvY3VtZW50KCktPmNvbnRlbnRT ZWN1cml0eVBvbGljeSgpLT5hbGxvd09iamVjdEZyb21Tb3VyY2UodXJsKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBBU1NFUlQob3duZXJFbGVtZW50LT5oYXNUYWdO YW1lKG9iamVjdFRhZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGVtYmVkVGFnKSk7CiAg ICAgcmV0dXJuIGxvYWRQbHVnaW4ob3duZXJFbGVtZW50LCB1cmwsIG1pbWVUeXBlLCBwYXJhbU5h bWVzLCBwYXJhbVZhbHVlcywgdXNlRmFsbGJhY2spOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAkocmV2aXNpb24gODIxNDcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ0MCw2ICs0NDAsMTEgQEAgYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93U2Ny aXB0RgogICAgIHJldHVybiAhbV9zY3JpcHRTcmMgfHwgbV9zY3JpcHRTcmMtPmFsbG93cyh1cmwp OwogfQogCitib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dPYmplY3RGcm9tU291cmNl KGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK3sKKyAgICByZXR1cm4gIW1fb2JqZWN0U3JjIHx8IG1f b2JqZWN0U3JjLT5hbGxvd3ModXJsKTsKK30KKwogLy8gcG9saWN5ICAgICAgICAgICAgPSBkaXJl Y3RpdmUtbGlzdAogLy8gZGlyZWN0aXZlLWxpc3QgICAgPSBbIGRpcmVjdGl2ZSAqKCAiOyIgWyBk aXJlY3RpdmUgXSApIF0KIC8vCkBAIC01MTQsMTEgKzUxOSwxNCBAQCBib29sIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6cGFyc2VEaXJlY3RpCiB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRk RGlyZWN0aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAg ICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgc2NyaXB0U3JjLCAoInNjcmlwdC1zcmMiKSk7 CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIG9iamVjdFNyYywgKCJvYmplY3Qtc3Jj IikpOwogCiAgICAgQVNTRVJUKCFuYW1lLmlzRW1wdHkoKSk7CiAKICAgICBpZiAoIW1fc2NyaXB0 U3JjICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHNjcmlwdFNyYykpCiAgICAgICAgIG1fc2Ny aXB0U3JjID0gYWRvcHRQdHIobmV3IENTUERpcmVjdGl2ZSh2YWx1ZSwgbV9vcmlnaW4uZ2V0KCkp KTsKKyAgICBlbHNlIGlmICghb2JqZWN0U3JjICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIG9i amVjdFNyYykpCisgICAgICAgIG1fb2JqZWN0U3JjID0gYWRvcHRQdHIobmV3IENTUERpcmVjdGl2 ZSh2YWx1ZSwgbV9vcmlnaW4uZ2V0KCkpKTsKIH0KIAogfQpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCShyZXZpc2lvbiA4MjE0NykKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgJKHdvcmtpbmcgY29weSkKQEAg LTQ4LDYgKzQ4LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dKYXZhU2NyaXB0VVJMcygpIGNv bnN0OwogICAgIGJvb2wgYWxsb3dJbmxpbmVFdmVudEhhbmRsZXJzKCkgY29uc3Q7CiAgICAgYm9v bCBhbGxvd1NjcmlwdEZyb21Tb3VyY2UoY29uc3QgS1VSTCYpIGNvbnN0OworICAgIGJvb2wgYWxs b3dPYmplY3RGcm9tU291cmNlKGNvbnN0IEtVUkwmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBl eHBsaWNpdCBDb250ZW50U2VjdXJpdHlQb2xpY3koU2VjdXJpdHlPcmlnaW4qKTsKQEAgLTU5LDYg KzYwLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGF2ZVBvbGljeTsKICAgICBSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+IG1fb3JpZ2luOwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fc2NyaXB0 U3JjOworICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fb2JqZWN0U3JjOwogfTsKIAogfQo= 88188 2011-04-05 00:46:44 -0700 2011-04-06 21:43:54 -0700 Patch bug-57283-20110405004642.patch text/plain 8576 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogODI5MDYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0YTM5YjlmZTI3MTNhY2QyMjhlMmNl YzBhNDAxODJkNTIzMjhlZGJjLi5iZDc0M2M4OGM0NDgwNTQwYTJiYzRlMjAyODZiOGJjOGUzMTZi MWQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMDUgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDU1Agb2JqZWN0LXNyYyBzaG91bGQgYmxvY2sgcGx1Z2luIGxvYWRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI4MworCisgICAgICAg ICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvb2JqZWN0LXNyYy1u b25lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvb2JqZWN0LXNyYy1ub25lLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9l Y2hvLW9iamVjdC1kYXRhLnBsOiBBZGRlZC4KKwogMjAxMS0wNC0wNCAgRGFuIEJlcm5zdGVpbiAg PG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5 UG9saWN5L29iamVjdC1zcmMtbm9uZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9vYmplY3Qtc3JjLW5vbmUtZXhwZWN0 ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjgyNGI3MDE4NmNhN2U2NzkzZjVkZmE5MGUyZjNiNGQ0MzU0NGI5 YzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2Nv bnRlbnRTZWN1cml0eVBvbGljeS9vYmplY3Qtc3JjLW5vbmUtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsMTIgQEAKK0FMRVJUOiBQbHVnaW4gTG9hZGVkIQorICAKKworLS0tLS0tLS0KK0ZyYW1lOiAn PCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTAtLT4tLT4nCistLS0tLS0tLQorCisKKy0tLS0tLS0t CitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUxLS0+LS0+JworLS0tLS0tLS0KKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp dHlQb2xpY3kvb2JqZWN0LXNyYy1ub25lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Nl Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9vYmplY3Qtc3JjLW5vbmUuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5lNjBiZjEyYzNhNTBmNGYyM2I0ZTBhYTdmMDg0ZWRmODdiMTc5NzQ4Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvb2JqZWN0LXNyYy1ub25lLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpIHsKKyAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQ2hpbGRGcmFtZXNBc1RleHQoKTsKK30KKzwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHk+CisgIDxpZnJhbWUgc3JjPSJodHRwOi8vMTI3LjAuMC4xOjgwMDAvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9lY2hvLW9iamVjdC1kYXRhLnBsP3E9 ZGF0YTphcHBsaWNhdGlvbi94LXdlYmtpdC10ZXN0LW5ldHNjYXBlLGFsZXJ0d2hlbmxvYWRlZCZj c3A9b2JqZWN0LXNyYyUyMCdub25lJyI+PC9pZnJhbWU+CisgIDxpZnJhbWUgc3JjPSJodHRwOi8v MTI3LjAuMC4xOjgwMDAvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291cmNlcy9l Y2hvLW9iamVjdC1kYXRhLnBsP3E9ZGF0YTphcHBsaWNhdGlvbi94LXdlYmtpdC10ZXN0LW5ldHNj YXBlLGFsZXJ0d2hlbmxvYWRlZCZjc3A9aW1nLXNyYyUyMCdub25lJyI+PC9pZnJhbWU+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvZWNoby1vYmplY3QtZGF0YS5wbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3Jlc291 cmNlcy9lY2hvLW9iamVjdC1kYXRhLnBsCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMyN2M4MGM1NDZhZDg3YzlmZTc3 ZWVlNTUzMTMwNzRmZGE4NWEyZDkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9yZXNvdXJjZXMvZWNoby1vYmpl Y3QtZGF0YS5wbApAQCAtMCwwICsxLDE1IEBACisjIS91c3IvYmluL3BlcmwgLXdUCit1c2Ugc3Ry aWN0OwordXNlIENHSTsKKworbXkgJGNnaSA9IG5ldyBDR0k7CisKK3ByaW50ICJDb250ZW50LVR5 cGU6IHRleHQvaHRtbDsgY2hhcnNldD1VVEYtOFxuIjsKK3ByaW50ICJYLVdlYktpdC1DU1A6ICIu JGNnaS0+cGFyYW0oJ2NzcCcpLiJcblxuIjsKKworcHJpbnQgIjwhRE9DVFlQRSBodG1sPlxuIjsK K3ByaW50ICI8aHRtbD5cbiI7CitwcmludCAiPGJvZHk+XG4iOworcHJpbnQgIjxvYmplY3QgZGF0 YT1cIiIuJGNnaS0+cGFyYW0oJ3EnKS4iXCI+PC9vYmplY3Q+XG4iOworcHJpbnQgIjwvYm9keT5c biI7CitwcmludCAiPC9odG1sPlxuIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMjU1MDMzNGM3ZjY4MTMyOWVm OWQxMzVhMTE5M2M1OTQxYmY3Y2VmLi4yZTYzNTRhMmQ0NzExODVkMGQ1MDUyYzczNzA4Yzc0NzUw ODE1ODFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMDUgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDU1Agb2JqZWN0LXNyYyBzaG91bGQgYmxvY2sgcGx1Z2luIGxvYWRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI4Mwor CisgICAgICAgIFRoaXMgY2hhbmdlIGlzIHByZXR0eSBzdHJhaWdodC1mb3J3YXJkLiAgSXQncyBz bGlnaGx5IHVuY2xlYXIgdG8gbWUKKyAgICAgICAgd2hldGhlciB0aGlzIHBhdGNoIGlzIGNvcnJl Y3Qgdy5yLnQuIHRoZSBjb2RlIGluIERvY3VtZW50V3JpdGVyLiAgSSd2ZQorICAgICAgICBhZGRl ZCBhIEZJWE1FIGNvbW1lbnQsIGFuZCBJJ2xsIGludmVzdGlnYXRlIHRoYXQgY2FzZSBtb3JlIGlu IHRoZSBmdXR1cmUuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kvb2JqZWN0LXNyYy1ub25lLmh0bWwKKworICAgICAgICAqIGxvYWRlci9E b2N1bWVudFdyaXRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFdyaXRlcjo6YmVn aW4pOgorICAgICAgICAqIGxvYWRlci9TdWJmcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdWJmcmFtZUxvYWRlcjo6cmVxdWVzdFBsdWdpbik6CisgICAgICAgICogcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5 UG9saWN5OjphbGxvd09iamVjdEZyb21Tb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dFNlY3VyaXR5UG9saWN5OjphZGREaXJlY3RpdmUpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNl Y3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDQtMDQgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEFkZCBhIGNhc2UgbGFiZWwgd2hpY2ggd2FzIHVuZXhwZWN0ZWRs eSByZW1vdmVkIGluIHI4Mjg5OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudFdyaXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIu Y3BwCmluZGV4IGFmOWVhNTM5NjMwZTBiODA0OTI4YzcyZWU2ZjkyYWRhYjM4YjEzZWEuLjJmYzAy ZDFjZjJlNzVlODE3NDY5ZGVkZmIxMGUwMDI5MmQ4MzQ1NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50V3JpdGVyLmNwcApAQCAtMTIxLDYgKzEyMSw4IEBAIHZvaWQgRG9jdW1lbnRX cml0ZXI6OmJlZ2luKGNvbnN0IEtVUkwmIHVybCwgYm9vbCBkaXNwYXRjaCwgU2VjdXJpdHlPcmln aW4qIG9yaWdpCiAgICAgaWYgKGRvY3VtZW50LT5pc1BsdWdpbkRvY3VtZW50KCkgJiYgbV9mcmFt ZS0+bG9hZGVyKCktPmlzU2FuZGJveGVkKFNhbmRib3hQbHVnaW5zKSkKICAgICAgICAgZG9jdW1l bnQgPSBTaW5rRG9jdW1lbnQ6OmNyZWF0ZShtX2ZyYW1lLCB1cmwpOwogCisgICAgLy8gRklYTUU6 IERvIHdlIG5lZWQgdG8gY29uc3VsdCB0aGUgY29udGVudCBzZWN1cml0eSBwb2xpY3kgaGVyZSBh Ym91dCBibG9ja2VkIHBsdWctaW5zPworCiAgICAgYm9vbCByZXNldFNjcmlwdGluZyA9ICEobV9m cmFtZS0+bG9hZGVyKCktPnN0YXRlTWFjaGluZSgpLT5pc0Rpc3BsYXlpbmdJbml0aWFsRW1wdHlE b2N1bWVudCgpICYmIG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmlzU2Vj dXJlVHJhbnNpdGlvblRvKHVybCkpOwogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGVhcihyZXNl dFNjcmlwdGluZywgcmVzZXRTY3JpcHRpbmcpOwogICAgIGNsZWFyKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcAppbmRleCBlN2Y4NTFmM2VlZGE0YWM3NzNjMjYzZmYw YzllYjRlYzgyMTZmN2NhLi5kMjkwNzY1NTk5ZjQwOWFmZjhiMmIwOGVkNjVhOGFhMTg5ZTdiZGY0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKQEAgLTMzLDYgKzMz LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTdWJmcmFtZUxvYWRlci5oIgog CisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIK ICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkhUTUxBcHBsZXRFbGVt ZW50LmgiCkBAIC0xMDksOCArMTEwLDEyIEBAIGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RQ bHVnaW4oSFRNTFBsdWdJbkltYWdlRWxlbWVudCogb3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAg ICAgIHx8ICghc2V0dGluZ3MtPmlzSmF2YUVuYWJsZWQoKSAmJiBNSU1FVHlwZVJlZ2lzdHJ5Ojpp c0phdmFBcHBsZXRNSU1FVHlwZShtaW1lVHlwZSkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1 cml0eU9yaWdpbigpLT5pc1NhbmRib3hlZChTYW5kYm94UGx1Z2lucykpCi0gICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSkgeworICAgICAgICBpZiAobV9m cmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aXNTYW5kYm94ZWQoU2FuZGJveFBs dWdpbnMpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIW1fZnJhbWUt PmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd09iamVjdEZyb21Tb3Vy Y2UodXJsKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBBU1NFUlQo b3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKG9iamVjdFRhZykgfHwgb3duZXJFbGVtZW50LT5oYXNU YWdOYW1lKGVtYmVkVGFnKSk7CiAgICAgcmV0dXJuIGxvYWRQbHVnaW4ob3duZXJFbGVtZW50LCB1 cmwsIG1pbWVUeXBlLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgdXNlRmFsbGJhY2spOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IDZiY2Y5 OWM4OTg4NjBmMDdjMjZhYWVhNDgxOGFlMGE5NzY0NGI1YTMuLjcyZjgwZWE0MzkxZTgyOTNmNTk2 NGU3ZTg2ODViYTZlY2ZiZmY5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRT ZWN1cml0eVBvbGljeS5jcHAKQEAgLTQ0MCw2ICs0NDAsMTEgQEAgYm9vbCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OmFsbG93U2NyaXB0RnJvbVNvdXJjZShjb25zdCBLVVJMJiB1cmwpIGNvbnN0CiAg ICAgcmV0dXJuICFtX3NjcmlwdFNyYyB8fCBtX3NjcmlwdFNyYy0+YWxsb3dzKHVybCk7CiB9CiAK K2Jvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd09iamVjdEZyb21Tb3VyY2UoY29uc3Qg S1VSTCYgdXJsKSBjb25zdAoreworICAgIHJldHVybiAhbV9vYmplY3RTcmMgfHwgbV9vYmplY3RT cmMtPmFsbG93cyh1cmwpOworfQorCiAvLyBwb2xpY3kgICAgICAgICAgICA9IGRpcmVjdGl2ZS1s aXN0CiAvLyBkaXJlY3RpdmUtbGlzdCAgICA9IFsgZGlyZWN0aXZlICooICI7IiBbIGRpcmVjdGl2 ZSBdICkgXQogLy8KQEAgLTUxNCwxMSArNTE5LDE0IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciogYmVnaW4sIGNvbnN0IFVDaGFyKiBlbmQs CiB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZlKGNvbnN0IFN0cmluZyYg bmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0 cmluZywgc2NyaXB0U3JjLCAoInNjcmlwdC1zcmMiKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NB TChTdHJpbmcsIG9iamVjdFNyYywgKCJvYmplY3Qtc3JjIikpOwogCiAgICAgQVNTRVJUKCFuYW1l LmlzRW1wdHkoKSk7CiAKICAgICBpZiAoIW1fc2NyaXB0U3JjICYmIGVxdWFsSWdub3JpbmdDYXNl KG5hbWUsIHNjcmlwdFNyYykpCiAgICAgICAgIG1fc2NyaXB0U3JjID0gYWRvcHRQdHIobmV3IENT UERpcmVjdGl2ZSh2YWx1ZSwgbV9vcmlnaW4uZ2V0KCkpKTsKKyAgICBlbHNlIGlmICghbV9vYmpl Y3RTcmMgJiYgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgb2JqZWN0U3JjKSkKKyAgICAgICAgbV9v YmplY3RTcmMgPSBhZG9wdFB0cihuZXcgQ1NQRGlyZWN0aXZlKHZhbHVlLCBtX29yaWdpbi5nZXQo KSkpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3ku aAppbmRleCBhN2NkMjE2YzU4NDFhZTU2NDNmOTZhMDAwYzgwZjk0MjQ4NTUxYjkxLi5hNDdiZGQ2 ODdjZGZlZmU2MWVlYmJhYzYwNTA1NTUzMWYzOWUzMTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKQEAgLTQ4LDYgKzQ4LDcgQEAgcHVibGljOgogICAg IGJvb2wgYWxsb3dKYXZhU2NyaXB0VVJMcygpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dJbmxpbmVF dmVudEhhbmRsZXJzKCkgY29uc3Q7CiAgICAgYm9vbCBhbGxvd1NjcmlwdEZyb21Tb3VyY2UoY29u c3QgS1VSTCYpIGNvbnN0OworICAgIGJvb2wgYWxsb3dPYmplY3RGcm9tU291cmNlKGNvbnN0IEtV UkwmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBDb250ZW50U2VjdXJpdHlQb2xp Y3koU2VjdXJpdHlPcmlnaW4qKTsKQEAgLTU5LDYgKzYwLDcgQEAgcHJpdmF0ZToKICAgICBib29s IG1faGF2ZVBvbGljeTsKICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG1fb3JpZ2luOwogICAg IE93blB0cjxDU1BEaXJlY3RpdmU+IG1fc2NyaXB0U3JjOworICAgIE93blB0cjxDU1BEaXJlY3Rp dmU+IG1fb2JqZWN0U3JjOwogfTsKIAogfQo=