203615 2019-10-30 10:39:24 -0700 Use SecurityOriginData in NetworkProcess where possible without other changes 2019-10-31 15:40:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 1 achristensen achristensen beidson dbates ews-watchlist mkwst repstein webkit-bug-importer oldest_to_newest 1585407 0 achristensen 2019-10-30 10:39:24 -0700 Use SecurityOriginData in NetworkProcess where possible without other changes 1585423 1 382331 achristensen 2019-10-30 10:57:31 -0700 Created attachment 382331 Patch 1585982 2 achristensen 2019-10-31 10:53:01 -0700 http://trac.webkit.org/r251861 1585983 3 webkit-bug-importer 2019-10-31 10:53:18 -0700 <rdar://problem/56787267> 1586109 4 repstein 2019-10-31 15:40:22 -0700 Reverted r251861 for reason: Caused 50+ Layout Test Crashes Committed r251887: <https://trac.webkit.org/changeset/251887> 382331 2019-10-30 10:57:31 -0700 2019-10-31 10:44:51 -0700 Patch bug-203615-20191030105730.patch text/plain 13797 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MTY4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEwLTMwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIFNlY3Vy aXR5T3JpZ2luRGF0YSBpbiBOZXR3b3JrUHJvY2VzcyB3aGVyZSBwb3NzaWJsZSB3aXRob3V0IG90 aGVyIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMzYxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbjo6U2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmln aW46Omlzb2xhdGVkQ29weSBjb25zdCk6CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5o OgorICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmg6CisgICAgICAgIChXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGE6OmVuY29kZSBjb25zdCk6CisgICAgICAgICogcGFnZS9jc3Av Q29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1 cml0eVBvbGljeTo6YWxsb3dGcmFtZUFuY2VzdG9ycyBjb25zdCk6CisgICAgICAgICogcGFnZS9j c3AvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisgICAgICAgICogcGFnZS9jc3AvQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cmxGcm9t T3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OmNoZWNrRnJhbWVBbmNlc3RvcnMpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWRE aXJlY3RpdmVGb3JGcmFtZUFuY2VzdG9yT3JpZ2lucyBjb25zdCk6CisgICAgICAgICogcGFnZS9j c3AvQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5oOgorCiAyMDE5LTEwLTI4ICBX ZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBiaW5k aW5ncyBzdXBwb3J0IGZvciB0aGUgZW50ZXJrZXloaW50IEhUTUwgYXR0cmlidXRlCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAkocmV2aXNpb24gMjUxNjg2KQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE3MSwxOSArMTcxLDE5IEBAIFNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbigpCiB7CiB9 CiAKLVNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiog b3RoZXIpCi0gICAgOiBtX2RhdGEgeyBvdGhlci0+bV9kYXRhLmlzb2xhdGVkQ29weSgpIH0KLSAg ICAsIG1fZG9tYWluIHsgb3RoZXItPm1fZG9tYWluLmlzb2xhdGVkQ29weSgpIH0KLSAgICAsIG1f ZmlsZVBhdGggeyBvdGhlci0+bV9maWxlUGF0aC5pc29sYXRlZENvcHkoKSB9Ci0gICAgLCBtX2lz VW5pcXVlIHsgb3RoZXItPm1faXNVbmlxdWUgfQotICAgICwgbV91bml2ZXJzYWxBY2Nlc3MgeyBv dGhlci0+bV91bml2ZXJzYWxBY2Nlc3MgfQotICAgICwgbV9kb21haW5XYXNTZXRJbkRPTSB7IG90 aGVyLT5tX2RvbWFpbldhc1NldEluRE9NIH0KLSAgICAsIG1fY2FuTG9hZExvY2FsUmVzb3VyY2Vz IHsgb3RoZXItPm1fY2FuTG9hZExvY2FsUmVzb3VyY2VzIH0KLSAgICAsIG1fc3RvcmFnZUJsb2Nr aW5nUG9saWN5IHsgb3RoZXItPm1fc3RvcmFnZUJsb2NraW5nUG9saWN5IH0KLSAgICAsIG1fZW5m b3JjZXNGaWxlUGF0aFNlcGFyYXRpb24geyBvdGhlci0+bV9lbmZvcmNlc0ZpbGVQYXRoU2VwYXJh dGlvbiB9Ci0gICAgLCBtX25lZWRzU3RvcmFnZUFjY2Vzc0Zyb21GaWxlVVJMc1F1aXJrIHsgb3Ro ZXItPm1fbmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZpbGVVUkxzUXVpcmsgfQotICAgICwgbV9pc1Bv dGVudGlhbGx5VHJ1c3R3b3J0aHkgeyBvdGhlci0+bV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkg fQotICAgICwgbV9pc0xvY2FsIHsgb3RoZXItPm1faXNMb2NhbCB9CitTZWN1cml0eU9yaWdpbjo6 U2VjdXJpdHlPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4mIG90aGVyKQorICAgIDogbV9kYXRh IHsgb3RoZXIubV9kYXRhLmlzb2xhdGVkQ29weSgpIH0KKyAgICAsIG1fZG9tYWluIHsgb3RoZXIu bV9kb21haW4uaXNvbGF0ZWRDb3B5KCkgfQorICAgICwgbV9maWxlUGF0aCB7IG90aGVyLm1fZmls ZVBhdGguaXNvbGF0ZWRDb3B5KCkgfQorICAgICwgbV9pc1VuaXF1ZSB7IG90aGVyLm1faXNVbmlx dWUgfQorICAgICwgbV91bml2ZXJzYWxBY2Nlc3MgeyBvdGhlci5tX3VuaXZlcnNhbEFjY2VzcyB9 CisgICAgLCBtX2RvbWFpbldhc1NldEluRE9NIHsgb3RoZXIubV9kb21haW5XYXNTZXRJbkRPTSB9 CisgICAgLCBtX2NhbkxvYWRMb2NhbFJlc291cmNlcyB7IG90aGVyLm1fY2FuTG9hZExvY2FsUmVz b3VyY2VzIH0KKyAgICAsIG1fc3RvcmFnZUJsb2NraW5nUG9saWN5IHsgb3RoZXIubV9zdG9yYWdl QmxvY2tpbmdQb2xpY3kgfQorICAgICwgbV9lbmZvcmNlc0ZpbGVQYXRoU2VwYXJhdGlvbiB7IG90 aGVyLm1fZW5mb3JjZXNGaWxlUGF0aFNlcGFyYXRpb24gfQorICAgICwgbV9uZWVkc1N0b3JhZ2VB Y2Nlc3NGcm9tRmlsZVVSTHNRdWlyayB7IG90aGVyLm1fbmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZp bGVVUkxzUXVpcmsgfQorICAgICwgbV9pc1BvdGVudGlhbGx5VHJ1c3R3b3J0aHkgeyBvdGhlci5t X2lzUG90ZW50aWFsbHlUcnVzdHdvcnRoeSB9CisgICAgLCBtX2lzTG9jYWwgeyBvdGhlci5tX2lz TG9jYWwgfQogewogfQogCkBAIC0yMTgsNyArMjE4LDcgQEAgUmVmPFNlY3VyaXR5T3JpZ2luPiBT ZWN1cml0eU9yaWdpbjo6Y3JlYQogCiBSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2lu Ojppc29sYXRlZENvcHkoKSBjb25zdAogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFNlY3Vy aXR5T3JpZ2luKHRoaXMpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTZWN1cml0eU9yaWdp bigqdGhpcykpOwogfQogCiB2b2lkIFNlY3VyaXR5T3JpZ2luOjpzZXREb21haW5Gcm9tRE9NKGNv bnN0IFN0cmluZyYgbmV3RG9tYWluKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0 eU9yaWdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmln aW4uaAkocmV2aXNpb24gMjUxNjg2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9y aWdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjEsNyArMjIxLDcgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBTZWN1cml0eU9yaWdpbigpOwogICAgIGV4cGxpY2l0IFNlY3VyaXR5T3JpZ2luKGNv bnN0IFVSTCYpOwotICAgIGV4cGxpY2l0IFNlY3VyaXR5T3JpZ2luKGNvbnN0IFNlY3VyaXR5T3Jp Z2luKik7CisgICAgZXhwbGljaXQgU2VjdXJpdHlPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4m KTsKIAogICAgIC8vIEZJWE1FOiBSZW5hbWUgdGhpcyBmdW5jdGlvbiB0byBzb21ldGhpbmcgbW9y ZSBzZW1hbnRpYy4KICAgICBib29sIHBhc3Nlc0ZpbGVDaGVjayhjb25zdCBTZWN1cml0eU9yaWdp biYpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbkRhdGEu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5o CShyZXZpc2lvbiAyNTE2ODYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2lu RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw2ICs5Nyw3IEBAIGlubGluZSBib29sIG9wZXJh dG9yIT0oY29uc3QgU2VjdXJpdHlPcmkKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIFNl Y3VyaXR5T3JpZ2luRGF0YTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAg QVNTRVJUKCFpc0VtcHR5KCkpOwogICAgIGVuY29kZXIgPDwgcHJvdG9jb2w7CiAgICAgZW5jb2Rl ciA8PCBob3N0OwogICAgIGVuY29kZXIgPDwgcG9ydDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAkocmV2aXNpb24gMjUxNjg2 KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTA4LDcgKzUwOCw3IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpvdmVycmlkZXNYRnIKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgQ29udGVudFNl Y3VyaXR5UG9saWN5OjphbGxvd0ZyYW1lQW5jZXN0b3JzKGNvbnN0IFZlY3RvcjxSZWZQdHI8U2Vj dXJpdHlPcmlnaW4+PiYgYW5jZXN0b3JPcmlnaW5zLCBjb25zdCBVUkwmIHVybCwgYm9vbCBvdmVy cmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSkgY29uc3QKK2Jvb2wgQ29udGVudFNlY3VyaXR5UG9s aWN5OjphbGxvd0ZyYW1lQW5jZXN0b3JzKGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+ JiBhbmNlc3Rvck9yaWdpbnMsIGNvbnN0IFVSTCYgdXJsLCBib29sIG92ZXJyaWRlQ29udGVudFNl Y3VyaXR5UG9saWN5KSBjb25zdAogewogICAgIGlmIChvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBv bGljeSkKICAgICAgICAgcmV0dXJuIHRydWU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL2Nz cC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL2NzcC9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAkocmV2aXNpb24gMjUxNjg2KQorKysgU291 cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5UG9saWN5LmgJKHdvcmtpbmcgY29w eSkKQEAgLTk5LDcgKzk5LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dQbHVnaW5UeXBlKGNv bnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiB0eXBlQXR0cmlidXRlLCBjb25zdCBVUkwm LCBib29sIG92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5ID0gZmFsc2UpIGNvbnN0OwogCiAg ICAgYm9vbCBhbGxvd0ZyYW1lQW5jZXN0b3JzKGNvbnN0IEZyYW1lJiwgY29uc3QgVVJMJiwgYm9v bCBvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGZhbHNlKSBjb25zdDsKLSAgICBXRUJD T1JFX0VYUE9SVCBib29sIGFsbG93RnJhbWVBbmNlc3RvcnMoY29uc3QgVmVjdG9yPFJlZlB0cjxT ZWN1cml0eU9yaWdpbj4+JiBhbmNlc3Rvck9yaWdpbnMsIGNvbnN0IFVSTCYsIGJvb2wgb3ZlcnJp ZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBP UlQgYm9vbCBhbGxvd0ZyYW1lQW5jZXN0b3JzKGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRh dGE+JiBhbmNlc3Rvck9yaWdpbnMsIGNvbnN0IFVSTCYsIGJvb2wgb3ZlcnJpZGVDb250ZW50U2Vj dXJpdHlQb2xpY3kgPSBmYWxzZSkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBvdmVy cmlkZXNYRnJhbWVPcHRpb25zKCkgY29uc3Q7CiAKICAgICBlbnVtIGNsYXNzIFJlZGlyZWN0UmVz cG9uc2VSZWNlaXZlZCB7IE5vLCBZZXMgfTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvY3Nw L0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3Qu Y3BwCShyZXZpc2lvbiAyNTE2ODYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL2NzcC9Db250ZW50 U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmVMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzksNiAr NzksMTEgQEAgc3RhdGljIGlubGluZSBVUkwgdXJsRnJvbU9yaWdpbihjb25zdCBTZQogICAgIHJl dHVybiB7IFVSTCB7IH0sIG9yaWdpbi50b1N0cmluZygpIH07CiB9CiAKK3N0YXRpYyBpbmxpbmUg VVJMIHVybEZyb21PcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBvcmlnaW4pCit7Cisg ICAgcmV0dXJuIHsgVVJMIHsgfSwgb3JpZ2luLnRvU3RyaW5nKCkgfTsKK30KKwogc3RhdGljIGlu bGluZSBib29sIGNoZWNrRnJhbWVBbmNlc3RvcnMoQ29udGVudFNlY3VyaXR5UG9saWN5U291cmNl TGlzdERpcmVjdGl2ZSogZGlyZWN0aXZlLCBjb25zdCBGcmFtZSYgZnJhbWUpCiB7CiAgICAgaWYg KCFkaXJlY3RpdmUpCkBAIC05MiwxMyArOTcsMTMgQEAgc3RhdGljIGlubGluZSBib29sIGNoZWNr RnJhbWVBbmNlc3RvcnMoQwogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgaW5saW5lIGJv b2wgY2hlY2tGcmFtZUFuY2VzdG9ycyhDb250ZW50U2VjdXJpdHlQb2xpY3lTb3VyY2VMaXN0RGly ZWN0aXZlKiBkaXJlY3RpdmUsIGNvbnN0IFZlY3RvcjxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+PiYg YW5jZXN0b3JPcmlnaW5zKQorc3RhdGljIGlubGluZSBib29sIGNoZWNrRnJhbWVBbmNlc3RvcnMo Q29udGVudFNlY3VyaXR5UG9saWN5U291cmNlTGlzdERpcmVjdGl2ZSogZGlyZWN0aXZlLCBjb25z dCBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiYgYW5jZXN0b3JPcmlnaW5zKQogewogICAgIGlm ICghZGlyZWN0aXZlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBib29sIGRpZFJlY2VpdmVS ZWRpcmVjdFJlc3BvbnNlID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBhbmNlc3Rv ck9yaWdpbnMpIHsKLSAgICAgICAgVVJMIG9yaWdpblVSTCA9IHVybEZyb21PcmlnaW4oKm9yaWdp bik7CisgICAgICAgIFVSTCBvcmlnaW5VUkwgPSB1cmxGcm9tT3JpZ2luKG9yaWdpbik7CiAgICAg ICAgIGlmICghb3JpZ2luVVJMLmlzVmFsaWQoKSB8fCAhZGlyZWN0aXZlLT5hbGxvd3Mob3JpZ2lu VVJMLCBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSwgQ29udGVudFNlY3VyaXR5UG9saWN5U291 cmNlTGlzdERpcmVjdGl2ZTo6U2hvdWxkQWxsb3dFbXB0eVVSTElmU291cmNlTGlzdElzTm90Tm9u ZTo6Tm8pKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTI1OCw3ICsyNjMs NyBAQCBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIENvCiAgICAgcmV0dXJu IG1fZnJhbWVBbmNlc3RvcnMuZ2V0KCk7CiB9CiAKLWNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGlj eURpcmVjdGl2ZSogQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlvbGF0ZWRE aXJlY3RpdmVGb3JGcmFtZUFuY2VzdG9yT3JpZ2lucyhjb25zdCBWZWN0b3I8UmVmUHRyPFNlY3Vy aXR5T3JpZ2luPj4mIGFuY2VzdG9yT3JpZ2lucykgY29uc3QKK2NvbnN0IENvbnRlbnRTZWN1cml0 eVBvbGljeURpcmVjdGl2ZSogQ29udGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdDo6dmlv bGF0ZWREaXJlY3RpdmVGb3JGcmFtZUFuY2VzdG9yT3JpZ2lucyhjb25zdCBWZWN0b3I8U2VjdXJp dHlPcmlnaW5EYXRhPiYgYW5jZXN0b3JPcmlnaW5zKSBjb25zdAogewogICAgIGlmIChjaGVja0Zy YW1lQW5jZXN0b3JzKG1fZnJhbWVBbmNlc3RvcnMuZ2V0KCksIGFuY2VzdG9yT3JpZ2lucykpCiAg ICAgICAgIHJldHVybiBudWxscHRyOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29u dGVudFNlY3VyaXR5UG9saWN5RGlyZWN0aXZlTGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvY3NwL0NvbnRlbnRTZWN1cml0eVBvbGljeURpcmVjdGl2ZUxpc3QuaAkocmV2 aXNpb24gMjUxNjg2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9jc3AvQ29udGVudFNlY3VyaXR5 UG9saWN5RGlyZWN0aXZlTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIHB1 YmxpYzoKICAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xhdGVk RGlyZWN0aXZlRm9yRm9ybUFjdGlvbihjb25zdCBVUkwmLCBib29sIGRpZFJlY2VpdmVSZWRpcmVj dFJlc3BvbnNlKSBjb25zdDsKICAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3Rp dmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yRnJhbWUoY29uc3QgVVJMJiwgYm9vbCBkaWRSZWNlaXZl UmVkaXJlY3RSZXNwb25zZSkgY29uc3Q7CiAgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvckZyYW1lQW5jZXN0b3IoY29uc3QgRnJhbWUm KSBjb25zdDsKLSAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJlY3RpdmUqIHZpb2xh dGVkRGlyZWN0aXZlRm9yRnJhbWVBbmNlc3Rvck9yaWdpbnMoY29uc3QgVmVjdG9yPFJlZlB0cjxT ZWN1cml0eU9yaWdpbj4+JikgY29uc3Q7CisgICAgY29uc3QgQ29udGVudFNlY3VyaXR5UG9saWN5 RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvckZyYW1lQW5jZXN0b3JPcmlnaW5zKGNvbnN0 IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JikgY29uc3Q7CiAgICAgY29uc3QgQ29udGVudFNl Y3VyaXR5UG9saWN5RGlyZWN0aXZlKiB2aW9sYXRlZERpcmVjdGl2ZUZvckltYWdlKGNvbnN0IFVS TCYsIGJvb2wgZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UpIGNvbnN0OwogI2lmIEVOQUJMRShB UFBMSUNBVElPTl9NQU5JRkVTVCkKICAgICBjb25zdCBDb250ZW50U2VjdXJpdHlQb2xpY3lEaXJl Y3RpdmUqIHZpb2xhdGVkRGlyZWN0aXZlRm9yTWFuaWZlc3QoY29uc3QgVVJMJiwgYm9vbCBkaWRS ZWNlaXZlUmVkaXJlY3RSZXNwb25zZSkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjUx Nzc4KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxOCBAQAorMjAxOS0xMC0zMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgorCisgICAgICAgIFVzZSBTZWN1cml0eU9yaWdpbkRhdGEgaW4gTmV0d29ya1Byb2Nl c3Mgd2hlcmUgcG9zc2libGUgd2l0aG91dCBvdGhlciBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM2MTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UmVzb3VyY2VMb2FkZXI6OnNob3VsZEludGVycnVwdExvYWRGb3JYRnJhbWVPcHRpb25zKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9j ZXNzKToKKwogMjAxOS0xMC0zMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIFtpT1NdIFtXSzJdIEltcHJvdmUgcHJvY2VzcyBhc3NlcnRpb24tcmVsYXRlZCBsb2dn aW5nIHRvIGhlbHAgaWRlbnRpZnkgY2F1c2VzIG9mIGxlYWtlZCBhc3NlcnRpb25zCkluZGV4OiBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjUxNjg2KQorKysgU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTkyLDcgKzkyLDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVyczo6ZW5jbwogICAgIGlmIChzb3VyY2VPcmlnaW4pCiAgICAgICAgIGVuY29kZXIgPDwg KnNvdXJjZU9yaWdpbjsKICAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KHRvcE9yaWdp bik7Ci0gICAgaWYgKHNvdXJjZU9yaWdpbikKKyAgICBpZiAodG9wT3JpZ2luKQogICAgICAgICBl bmNvZGVyIDw8ICp0b3BPcmlnaW47CiAgICAgZW5jb2RlciA8PCBvcHRpb25zOwogICAgIGVuY29k ZXIgPDwgY3NwUmVzcG9uc2VIZWFkZXJzOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAko cmV2aXNpb24gMjUxNjg2KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBA IHB1YmxpYzoKICAgICBib29sIHNob3VsZFJlc3RyaWN0SFRUUFJlc3BvbnNlQWNjZXNzIHsgZmFs c2UgfTsKICAgICBXZWJDb3JlOjpQcmVmbGlnaHRQb2xpY3kgcHJlZmxpZ2h0UG9saWN5IHsgV2Vi Q29yZTo6UHJlZmxpZ2h0UG9saWN5OjpDb25zaWRlciB9OwogICAgIGJvb2wgc2hvdWxkRW5hYmxl Q3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSB7IGZhbHNlIH07Ci0gICAgVmVjdG9yPFJlZlB0cjxX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IGZyYW1lQW5jZXN0b3JPcmlnaW5zOworICAgIFZlY3Rv cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+IGZyYW1lQW5jZXN0b3JPcmlnaW5zOwogICAg IGJvb2wgaXNIVFRQU1VwZ3JhZGVFbmFibGVkIHsgZmFsc2UgfTsKIAogI2lmIEVOQUJMRShTRVJW SUNFX1dPUktFUikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDI1MTY4NikKKysrIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDEwLDExICs0MTAsOCBAQCBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6 c2hvdWxkSW50ZXJyCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGNhc2UgWEZyYW1lT3B0aW9u c1NhbWVPcmlnaW46IHsKICAgICAgICAgYXV0byBvcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlKHVybCk7Ci0gICAgICAgIGF1dG8gdG9wRnJhbWVPcmlnaW4gPSBtX3BhcmFtZXRlcnMuZnJh bWVBbmNlc3Rvck9yaWdpbnMubGFzdCgpOwotICAgICAgICBpZiAoIW9yaWdpbi0+aXNTYW1lU2No ZW1lSG9zdFBvcnQoKnRvcEZyYW1lT3JpZ2luKSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICBmb3IgKGF1dG8mIGFuY2VzdG9yT3JpZ2luIDogbV9wYXJhbWV0ZXJzLmZyYW1lQW5j ZXN0b3JPcmlnaW5zKSB7Ci0gICAgICAgICAgICBpZiAoIW9yaWdpbi0+aXNTYW1lU2NoZW1lSG9z dFBvcnQoKmFuY2VzdG9yT3JpZ2luKSkKKyAgICAgICAgICAgIGlmICghb3JpZ2luLT5pc1NhbWVT Y2hlbWVIb3N0UG9ydChhbmNlc3Rvck9yaWdpbi5zZWN1cml0eU9yaWdpbigpKSkKICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9h ZGVyU3RyYXRlZ3kuY3BwCShyZXZpc2lvbiAyNTE2ODYpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMz Niw5ICszMzYsOSBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tCiAg ICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxkRW5hYmxlQ3Jvc3NPcmlnaW5SZXNvdXJjZVBvbGljeSA9 IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuY3Jvc3NPcmlnaW5SZXNv dXJjZVBvbGljeUVuYWJsZWQoKSAmJiAhbG9hZFBhcmFtZXRlcnMuaXNNYWluRnJhbWVOYXZpZ2F0 aW9uOwogCiAgICAgaWYgKHJlc291cmNlTG9hZGVyLm9wdGlvbnMoKS5tb2RlID09IEZldGNoT3B0 aW9uczo6TW9kZTo6TmF2aWdhdGUpIHsKLSAgICAgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9y aWdpbj4+IGZyYW1lQW5jZXN0b3JPcmlnaW5zOworICAgICAgICBWZWN0b3I8U2VjdXJpdHlPcmln aW5EYXRhPiBmcmFtZUFuY2VzdG9yT3JpZ2luczsKICAgICAgICAgZm9yIChhdXRvKiBmcmFtZSA9 IHJlc291cmNlTG9hZGVyLmZyYW1lKCktPnRyZWUoKS5wYXJlbnQoKTsgZnJhbWU7IGZyYW1lID0g ZnJhbWUtPnRyZWUoKS5wYXJlbnQoKSkKLSAgICAgICAgICAgIGZyYW1lQW5jZXN0b3JPcmlnaW5z LmFwcGVuZChtYWtlUmVmUHRyKGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpKSk7 CisgICAgICAgICAgICBmcmFtZUFuY2VzdG9yT3JpZ2lucy5hcHBlbmQoZnJhbWUtPmRvY3VtZW50 KCktPnNlY3VyaXR5T3JpZ2luKCkuZGF0YSgpKTsKICAgICAgICAgbG9hZFBhcmFtZXRlcnMuZnJh bWVBbmNlc3Rvck9yaWdpbnMgPSBXVEZNb3ZlKGZyYW1lQW5jZXN0b3JPcmlnaW5zKTsKICAgICB9 CiAK