141971 2015-02-24 09:25:12 -0800 Tighten up some SecurityOrigin related code, use references where possible 2015-02-24 09:55:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1071689 0 andersca 2015-02-24 09:25:12 -0800 Tighten up some SecurityOrigin related code, use references where possible 1071690 1 247237 andersca 2015-02-24 09:25:34 -0800 Created attachment 247237 Patch 1071696 2 andersca 2015-02-24 09:55:54 -0800 Committed r180568: <http://trac.webkit.org/changeset/180568> 247237 2015-02-24 09:25:34 -0800 2015-02-24 09:28:18 -0800 Patch bug-141971-20150224092522.patch text/plain 14330 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjllNDMwNGY0NmJjODA0 MmRjYjAwOTFjMzI2OWMzN2Q5NDE3MmNjMi4uMjM3NzZmMWNhMzIwNzQ3NWE3ZDE2NGYwMWZkNjI3 M2E5NTBhN2U0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTAyLTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVGlnaHRlbiB1cCBz b21lIFNlY3VyaXR5T3JpZ2luIHJlbGF0ZWQgY29kZSwgdXNlIHJlZmVyZW5jZXMgd2hlcmUgcG9z c2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MTk3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog RGF0YWJhc2VQcm9jZXNzL0RhdGFiYXNlUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRh dGFiYXNlUHJvY2Vzczo6Z2V0SW5kZXhlZERhdGFiYXNlT3JpZ2lucyk6CisgICAgICAgICogU2hh cmVkL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlY3VyaXR5T3Jp Z2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6U2VjdXJpdHlP cmlnaW5EYXRhOjpzZWN1cml0eU9yaWdpbik6CisgICAgICAgICogU2hhcmVkL1NlY3VyaXR5T3Jp Z2luRGF0YS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNw cDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVRyYW5zaWVudExvY2Fs U3RvcmFnZU1hcCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dl YklEQlNlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJD b25uZWN0aW9uOjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L01lZGlhQ2FjaGUvV2ViTWVkaWFLZXlTdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYk1lZGlhS2V5U3RvcmFnZU1hbmFnZXI6OmdldE1lZGlhS2V5T3JpZ2lucyk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcDoKKyAgICAgICAgKFdl YktpdDo6U3RvcmFnZUFyZWFNYXA6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VB cmVhTWFwOjpTdG9yYWdlQXJlYU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VBcmVhTWFw OjpkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdl QXJlYU1hcDo6ZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudCk6CisgICAgICAgICogV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU5hbWVz cGFjZUltcGw6OnN0b3JhZ2VBcmVhKToKKwogMjAxNS0wMi0yMyAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBBUEkgZm9yIGZldGNoaW5nIHdlYnNp dGUgZGF0YSByZWNvcmRzIHRvIF9XS1dlYnNpdGVEYXRhU3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9EYXRhYmFzZVByb2Nlc3MuY3BwIGIvU291cmNlL1dl YktpdDIvRGF0YWJhc2VQcm9jZXNzL0RhdGFiYXNlUHJvY2Vzcy5jcHAKaW5kZXggMDRjNTIwNzg3 YWE3NDY4YjQ2NjIxYzFlMzBhMmZlN2QwYjFhODU5OS4uOTBhMTY4N2ZlM2QzZTk2YWNlODYwMmI1 MTkxY2MzMjg3Yzc3YTUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9j ZXNzL0RhdGFiYXNlUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9j ZXNzL0RhdGFiYXNlUHJvY2Vzcy5jcHAKQEAgLTIxOCw3ICsyMTgsNyBAQCBWZWN0b3I8U2VjdXJp dHlPcmlnaW5EYXRhPiBEYXRhYmFzZVByb2Nlc3M6OmdldEluZGV4ZWREYXRhYmFzZU9yaWdpbnMo KQogICAgICAgICBpZiAoIXNlY3VyaXR5T3JpZ2luKQogICAgICAgICAgICAgY29udGludWU7CiAK LSAgICAgICAgcmVzdWx0cy5hcHBlbmQoU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlP cmlnaW4oc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKTsKKyAgICAgICAgcmVzdWx0cy5hcHBlbmQoU2Vj dXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4oKnNlY3VyaXR5T3JpZ2luKSk7CiAg ICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZWN1 cml0eU9yaWdpbkRhdGEuY3BwCmluZGV4IDI4YTc5NDkxYmM4MzhjZTU0OGQ0ZTc5MWUyMGI3MjFh ZTNkZTkwZjIuLmIwZGFkMmUyZjAwZWYxMzRlMjBlMjM2N2MxODJkMTcyMDdjNjY4MmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZWN1cml0eU9yaWdpbkRhdGEuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZWN1cml0eU9yaWdpbkRhdGEuY3BwCkBAIC0zNSwxOCAr MzUsMTggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewog Ci1TZWN1cml0eU9yaWdpbkRhdGEgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmln aW4oY29uc3QgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQorU2VjdXJpdHlPcmlnaW5E YXRhIFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKGNvbnN0IFNlY3VyaXR5 T3JpZ2luJiBzZWN1cml0eU9yaWdpbikKIHsKICAgICBTZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJp dHlPcmlnaW5EYXRhOwogCi0gICAgc2VjdXJpdHlPcmlnaW5EYXRhLnByb3RvY29sID0gc2VjdXJp dHlPcmlnaW4tPnByb3RvY29sKCk7Ci0gICAgc2VjdXJpdHlPcmlnaW5EYXRhLmhvc3QgPSBzZWN1 cml0eU9yaWdpbi0+aG9zdCgpOwotICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5wb3J0ID0gc2VjdXJp dHlPcmlnaW4tPnBvcnQoKTsKKyAgICBzZWN1cml0eU9yaWdpbkRhdGEucHJvdG9jb2wgPSBzZWN1 cml0eU9yaWdpbi5wcm90b2NvbCgpOworICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5ob3N0ID0gc2Vj dXJpdHlPcmlnaW4uaG9zdCgpOworICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5wb3J0ID0gc2VjdXJp dHlPcmlnaW4ucG9ydCgpOwogCiAgICAgcmV0dXJuIHNlY3VyaXR5T3JpZ2luRGF0YTsKIH0KIAot UGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gU2VjdXJpdHlPcmlnaW5EYXRhOjpzZWN1cml0eU9y aWdpbigpIGNvbnN0CitSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luRGF0YTo6c2Vj dXJpdHlPcmlnaW4oKSBjb25zdAogewogICAgIHJldHVybiBTZWN1cml0eU9yaWdpbjo6Y3JlYXRl KHByb3RvY29sLCBob3N0LCBwb3J0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9TZWN1cml0eU9yaWdpbkRhdGEuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TZWN1cml0 eU9yaWdpbkRhdGEuaAppbmRleCA5ZGEyZjFkNDdkZjRlZTcxMDgyZjg3YjE1MjdkYTI5NWYzOWEw NzUwLi41OWQ4MzgxNDc3MjA5NDRhYWI4OGU1MDQ1MDAwZjE1MzQ5NWUyNWUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2VjdXJpdHlPcmlnaW5EYXRhLmgKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL1NlY3VyaXR5T3JpZ2luRGF0YS5oCkBAIC00MCw4ICs0MCw4IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8QVBJOjpBcnJheSo+IEFy cmF5Q2FsbGJhY2s7CiAKIHN0cnVjdCBTZWN1cml0eU9yaWdpbkRhdGEgewotICAgIHN0YXRpYyBT ZWN1cml0eU9yaWdpbkRhdGEgZnJvbVNlY3VyaXR5T3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luKik7Ci0gICAgUGFzc1JlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4gc2Vj dXJpdHlPcmlnaW4oKSBjb25zdDsKKyAgICBzdGF0aWMgU2VjdXJpdHlPcmlnaW5EYXRhIGZyb21T ZWN1cml0eU9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYpOworICAgIFJlZjxX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW4oKSBjb25zdDsKIAogICAgIHZv aWQgZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJikgY29uc3Q7CiAgICAgc3RhdGljIGJvb2wg ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiwgU2VjdXJpdHlPcmlnaW5EYXRhJik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAK aW5kZXggZDcxY2Q1MGQ4MmVhM2U1Y2FkM2E3ZmYyM2FkNGNlNWRkYWNhZDkyZC4uODkyNDdkMjk3 YmQyM2RmOTEwOTYzNzM1NTQ5MzUzNDUwMDVkNjgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNjI0LDcgKzYyNCw3 IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU1hcChJ UEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sCiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJl IGEgbWVzc2FnZSBjaGVjay4KICAgICBBU1NFUlQoIXNsb3QpOwogCi0gICAgVHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlKiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRP ckNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZShzdG9yYWdlTmFtZXNwYWNlSUQs ICp0b3BMZXZlbE9yaWdpbkRhdGEuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgVHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlKiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRP ckNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZShzdG9yYWdlTmFtZXNwYWNlSUQs IHRvcExldmVsT3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpKTsKIAogICAgIGF1dG8gc3RvcmFn ZUFyZWEgPSB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmdldE9yQ3JlYXRlU3RvcmFn ZUFyZWEoc2VjdXJpdHlPcmlnaW5EYXRhLnNlY3VyaXR5T3JpZ2luKCkpOwogICAgIHN0b3JhZ2VB cmVhLT5hZGRMaXN0ZW5lcihjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZl ckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5k ZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwCmluZGV4IGY2OTBlYjczZThhN2RmNDc2 NjczOWI1MmY2MDdiOTdkNjY4ZjYxYmEuLjY3NWViNjQxMGRiMGNiMGJiOTcxZWNjNTI1M2FlMzJh MTJiZDkxZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2Vz L0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5j cHAKQEAgLTY2LDcgKzY2LDcgQEAgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6V2ViSURCU2VydmVy Q29ubmVjdGlvbihjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QKICAgICAsIG1fbWFp bkZyYW1lT3JpZ2luKG1haW5GcmFtZU9yaWdpbi5pc29sYXRlZENvcHkoKSkKIHsKICAgICBzZW5k KE1lc3NhZ2VzOjpEYXRhYmFzZVRvV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OkVzdGFibGlzaElEQkNv bm5lY3Rpb24obV9zZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllcikpOwotICAgIHNlbmQoTWVzc2Fn ZXM6OkRhdGFiYXNlUHJvY2Vzc0lEQkNvbm5lY3Rpb246OkVzdGFibGlzaENvbm5lY3Rpb24oZGF0 YWJhc2VOYW1lLCBTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbigmb3Blbmlu Z09yaWdpbiksIFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKCZtYWluRnJh bWVPcmlnaW4pKSk7CisgICAgc2VuZChNZXNzYWdlczo6RGF0YWJhc2VQcm9jZXNzSURCQ29ubmVj dGlvbjo6RXN0YWJsaXNoQ29ubmVjdGlvbihkYXRhYmFzZU5hbWUsIFNlY3VyaXR5T3JpZ2luRGF0 YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG9wZW5pbmdPcmlnaW4pLCBTZWN1cml0eU9yaWdpbkRhdGE6 OmZyb21TZWN1cml0eU9yaWdpbihtYWluRnJhbWVPcmlnaW4pKSk7CiB9CiAKIFdlYklEQlNlcnZl ckNvbm5lY3Rpb246On5XZWJJREJTZXJ2ZXJDb25uZWN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJNZWRpYUtleVN0b3JhZ2VNYW5hZ2Vy LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJNZWRpYUtleVN0 b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA2MDc0OGM2OWMyZmJlYmQ5NDkzMGUwNGUxZGE4YjNlNzI0 MGQyYzYxLi4zMmNjNzA1ZGY4MWMxODMwMDM3YzMzOTdlNTVkYjEyMTE2YWQ1ZDEwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL01lZGlhQ2FjaGUvV2ViTWVkaWFLZXlTdG9y YWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9NZWRpYUNhY2hl L1dlYk1lZGlhS2V5U3RvcmFnZU1hbmFnZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIFZlY3RvcjxT ZWN1cml0eU9yaWdpbkRhdGE+IFdlYk1lZGlhS2V5U3RvcmFnZU1hbmFnZXI6OmdldE1lZGlhS2V5 T3JpZ2lucygpCiAgICAgICAgIGlmICghc2VjdXJpdHlPcmlnaW4pCiAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICByZXN1bHRzLmFwcGVuZChTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21T ZWN1cml0eU9yaWdpbihzZWN1cml0eU9yaWdpbi5nZXQoKSkpOworICAgICAgICByZXN1bHRzLmFw cGVuZChTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbigqc2VjdXJpdHlPcmln aW4pKTsKICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFNYXAuY3BwCmluZGV4IGUyMTg1MTYz MDg4NzdkZjIxNDUyZmY5YjNhYzFhYmZjMjU2ZmMwZmYuLjdkYWU2ZWFjOTk2MDE2OGI2MDYwODA5 YjA0YTNmYzVkNTNhMTk0MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv U3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmNwcApAQCAtNTMsMTcgKzUzLDE3IEBAIHN0YXRpYyB1 aW50NjRfdCBnZW5lcmF0ZVN0b3JhZ2VNYXBJRCgpCiAgICAgcmV0dXJuICsrc3RvcmFnZU1hcElE OwogfQogCi1QYXNzUmVmUHRyPFN0b3JhZ2VBcmVhTWFwPiBTdG9yYWdlQXJlYU1hcDo6Y3JlYXRl KFN0b3JhZ2VOYW1lc3BhY2VJbXBsKiBzdG9yYWdlTmFtZXNwYWNlLCBQYXNzUmVmUHRyPFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbikKK1Bhc3NSZWZQdHI8U3RvcmFnZUFy ZWFNYXA+IFN0b3JhZ2VBcmVhTWFwOjpjcmVhdGUoU3RvcmFnZU5hbWVzcGFjZUltcGwqIHN0b3Jh Z2VOYW1lc3BhY2UsIFJlZjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4mJiBzZWN1cml0eU9yaWdp bikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VBcmVhTWFwKHN0b3JhZ2VOYW1l c3BhY2UsIHNlY3VyaXR5T3JpZ2luKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdG9yYWdl QXJlYU1hcChzdG9yYWdlTmFtZXNwYWNlLCBXVEY6Om1vdmUoc2VjdXJpdHlPcmlnaW4pKSk7CiB9 CiAKLVN0b3JhZ2VBcmVhTWFwOjpTdG9yYWdlQXJlYU1hcChTdG9yYWdlTmFtZXNwYWNlSW1wbCog c3RvcmFnZU5hbWVzcGFjZSwgUGFzc1JlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4gc2Vj dXJpdHlPcmlnaW4pCitTdG9yYWdlQXJlYU1hcDo6U3RvcmFnZUFyZWFNYXAoU3RvcmFnZU5hbWVz cGFjZUltcGwqIHN0b3JhZ2VOYW1lc3BhY2UsIFJlZjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4m JiBzZWN1cml0eU9yaWdpbikKICAgICA6IG1fc3RvcmFnZU1hcElEKGdlbmVyYXRlU3RvcmFnZU1h cElEKCkpCiAgICAgLCBtX3N0b3JhZ2VUeXBlKHN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VUeXBl KCkpCiAgICAgLCBtX3N0b3JhZ2VOYW1lc3BhY2VJRChzdG9yYWdlTmFtZXNwYWNlLT5zdG9yYWdl TmFtZXNwYWNlSUQoKSkKICAgICAsIG1fcXVvdGFJbkJ5dGVzKHN0b3JhZ2VOYW1lc3BhY2UtPnF1 b3RhSW5CeXRlcygpKQotICAgICwgbV9zZWN1cml0eU9yaWdpbihzZWN1cml0eU9yaWdpbikKKyAg ICAsIG1fc2VjdXJpdHlPcmlnaW4oV1RGOjptb3ZlKHNlY3VyaXR5T3JpZ2luKSkKICAgICAsIG1f Y3VycmVudFNlZWQoMCkKICAgICAsIG1faGFzUGVuZGluZ0NsZWFyKGZhbHNlKQogICAgICwgbV9o YXNQZW5kaW5nR2V0VmFsdWVzKGZhbHNlKQpAQCAtNzEsNyArNzEsNyBAQCBTdG9yYWdlQXJlYU1h cDo6U3RvcmFnZUFyZWFNYXAoU3RvcmFnZU5hbWVzcGFjZUltcGwqIHN0b3JhZ2VOYW1lc3BhY2Us IFBhc3NSZWZQdAogICAgIHN3aXRjaCAobV9zdG9yYWdlVHlwZSkgewogICAgIGNhc2UgV2ViQ29y ZTo6TG9jYWxTdG9yYWdlOgogICAgICAgICBpZiAoU2VjdXJpdHlPcmlnaW4qIHRvcExldmVsT3Jp Z2luID0gc3RvcmFnZU5hbWVzcGFjZS0+dG9wTGV2ZWxPcmlnaW4oKSkKLSAgICAgICAgICAgIFdl YlByb2Nlc3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6OlN0b3JhZ2VNYW5hZ2VyOjpDcmVhdGVUcmFuc2llbnRMb2NhbFN0b3JhZ2VNYXAobV9z dG9yYWdlTWFwSUQsIHN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VOYW1lc3BhY2VJRCgpLCBTZWN1 cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbih0b3BMZXZlbE9yaWdpbiksIFNlY3Vy aXR5T3JpZ2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkp KSwgMCk7CisgICAgICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNz Q29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6Q3JlYXRlVHJhbnNp ZW50TG9jYWxTdG9yYWdlTWFwKG1fc3RvcmFnZU1hcElELCBzdG9yYWdlTmFtZXNwYWNlLT5zdG9y YWdlTmFtZXNwYWNlSUQoKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4o KnRvcExldmVsT3JpZ2luKSwgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlPcmlnaW4o bV9zZWN1cml0eU9yaWdpbi5nZXQoKSkpLCAwKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAg V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChN ZXNzYWdlczo6U3RvcmFnZU1hbmFnZXI6OkNyZWF0ZUxvY2FsU3RvcmFnZU1hcChtX3N0b3JhZ2VN YXBJRCwgc3RvcmFnZU5hbWVzcGFjZS0+c3RvcmFnZU5hbWVzcGFjZUlEKCksIFNlY3VyaXR5T3Jp Z2luRGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKSwgMCk7 CiAKQEAgLTMyNSw3ICszMjUsNyBAQCB2b2lkIFN0b3JhZ2VBcmVhTWFwOjpkaXNwYXRjaFNlc3Np b25TdG9yYWdlRXZlbnQodWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgYwogICAgIFBhZ2Uq IHBhZ2UgPSB3ZWJQYWdlLT5jb3JlUGFnZSgpOwogICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJnBh Z2UtPm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4 dCgpKSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpOwot ICAgICAgICBpZiAoIWRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpLT5lcXVhbChtX3NlY3VyaXR5 T3JpZ2luLmdldCgpKSkKKyAgICAgICAgaWYgKCFkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKS0+ ZXF1YWwobV9zZWN1cml0eU9yaWdpbi5wdHIoKSkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAog ICAgICAgICBTdG9yYWdlKiBzdG9yYWdlID0gZG9jdW1lbnQtPmRvbVdpbmRvdygpLT5vcHRpb25h bFNlc3Npb25TdG9yYWdlKCk7CkBAIC0zNDEsNyArMzQxLDcgQEAgdm9pZCBTdG9yYWdlQXJlYU1h cDo6ZGlzcGF0Y2hTZXNzaW9uU3RvcmFnZUV2ZW50KHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVh SUQsIGMKICAgICAgICAgZnJhbWVzLmFwcGVuZChmcmFtZSk7CiAgICAgfQogCi0gICAgU3RvcmFn ZUV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudHNUb0ZyYW1lcyhwYWdl LT5ncm91cCgpLCBmcmFtZXMsIGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcsIG1f c2VjdXJpdHlPcmlnaW4uZ2V0KCkpOworICAgIFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRpc3Bh dGNoTG9jYWxTdG9yYWdlRXZlbnRzVG9GcmFtZXMocGFnZS0+Z3JvdXAoKSwgZnJhbWVzLCBrZXks IG9sZFZhbHVlLCBuZXdWYWx1ZSwgdXJsU3RyaW5nLCBtX3NlY3VyaXR5T3JpZ2luLnB0cigpKTsK IH0KIAogdm9pZCBTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudCh1aW50 NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJp bmcpCkBAIC0zNTUsNyArMzU1LDcgQEAgdm9pZCBTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hMb2Nh bFN0b3JhZ2VFdmVudCh1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb24KICAgICBmb3Ig KEhhc2hTZXQ8UGFnZSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHBhZ2VzLmJlZ2luKCksIGVuZCA9 IHBhZ2VzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgZm9yIChGcmFtZSogZnJh bWUgPSAmKCppdCktPm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRy YXZlcnNlTmV4dCgpKSB7CiAgICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZS0+ ZG9jdW1lbnQoKTsKLSAgICAgICAgICAgIGlmICghZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCkt PmVxdWFsKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKQorICAgICAgICAgICAgaWYgKCFkb2N1bWVu dC0+c2VjdXJpdHlPcmlnaW4oKS0+ZXF1YWwobV9zZWN1cml0eU9yaWdpbi5wdHIoKSkpCiAgICAg ICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIFN0b3JhZ2UqIHN0b3JhZ2UgPSBk b2N1bWVudC0+ZG9tV2luZG93KCktPm9wdGlvbmFsTG9jYWxTdG9yYWdlKCk7CkBAIC0zNzIsNyAr MzcyLDcgQEAgdm9pZCBTdG9yYWdlQXJlYU1hcDo6ZGlzcGF0Y2hMb2NhbFN0b3JhZ2VFdmVudCh1 aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCBjb24KICAgICAgICAgfQogICAgIH0KIAotICAg IFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoTG9jYWxTdG9yYWdlRXZlbnRzVG9GcmFt ZXMocGFnZUdyb3VwLCBmcmFtZXMsIGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcs IG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpOworICAgIFN0b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRp c3BhdGNoTG9jYWxTdG9yYWdlRXZlbnRzVG9GcmFtZXMocGFnZUdyb3VwLCBmcmFtZXMsIGtleSwg b2xkVmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcsIG1fc2VjdXJpdHlPcmlnaW4ucHRyKCkpOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYU1hcC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhTWFwLmgKaW5kZXggMjY0MjU2YjcxYzM0ZmYzY2MzYzNj YmRmN2JlM2I3YjliZWZmY2VmZC4uNWNiYTY5MzQwYTM2YTk5MjdlYWQyNzNmMjVhMTE5ZTRjYzk4 M2U3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhTWFwLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhTWFwLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgY2xhc3MgU3RvcmFnZU5hbWVzcGFjZUltcGw7 CiAKIGNsYXNzIFN0b3JhZ2VBcmVhTWFwIDogcHVibGljIFJlZkNvdW50ZWQ8U3RvcmFnZUFyZWFN YXA+LCBwcml2YXRlIElQQzo6TWVzc2FnZVJlY2VpdmVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMg UGFzc1JlZlB0cjxTdG9yYWdlQXJlYU1hcD4gY3JlYXRlKFN0b3JhZ2VOYW1lc3BhY2VJbXBsKiwg UGFzc1JlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4pOworICAgIHN0YXRpYyBQYXNzUmVm UHRyPFN0b3JhZ2VBcmVhTWFwPiBjcmVhdGUoU3RvcmFnZU5hbWVzcGFjZUltcGwqLCBSZWY8V2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW4+JiYpOwogICAgIH5TdG9yYWdlQXJlYU1hcCgpOwogCiAgICAg V2ViQ29yZTo6U3RvcmFnZVR5cGUgc3RvcmFnZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX3N0b3Jh Z2VUeXBlOyB9CkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICBib29sIGNvbnRhaW5zKGNv bnN0IFN0cmluZyYga2V5KTsKIAogcHJpdmF0ZToKLSAgICBTdG9yYWdlQXJlYU1hcChTdG9yYWdl TmFtZXNwYWNlSW1wbCosIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+KTsKKyAg ICBTdG9yYWdlQXJlYU1hcChTdG9yYWdlTmFtZXNwYWNlSW1wbCosIFJlZjxXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbj4mJik7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZpcnR1 YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6Ok1lc3NhZ2VE ZWNvZGVyJikgb3ZlcnJpZGU7CkBAIC04Nyw3ICs4Nyw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29y ZTo6U3RvcmFnZVR5cGUgbV9zdG9yYWdlVHlwZTsKICAgICB1aW50NjRfdCBtX3N0b3JhZ2VOYW1l c3BhY2VJRDsKICAgICB1bnNpZ25lZCBtX3F1b3RhSW5CeXRlczsKLSAgICBSZWZQdHI8V2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4+IG1fc2VjdXJpdHlPcmlnaW47CisgICAgUmVmPFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luPiBtX3NlY3VyaXR5T3JpZ2luOwogCiAgICAgUmVmUHRyPFdlYkNvcmU6OlN0 b3JhZ2VNYXA+IG1fc3RvcmFnZU1hcDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTmFtZXNwYWNlSW1wbC5jcHAKaW5kZXggOWY3Yzg2 OGUxOTBiZmM3ZGFmNTY3MjU5NTM3YTk1NjRjNjJhNGUyMC4uZmNiYjQ5Zjc2NWEzYTQ3Y2YwZjVm NjE5OTlhNGNlNjAzZDYxYjNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VOYW1lc3BhY2VJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU5hbWVzcGFjZUltcGwuY3BwCkBAIC03MSw3ICs3MSw3 IEBAIFBhc3NSZWZQdHI8U3RvcmFnZUFyZWE+IFN0b3JhZ2VOYW1lc3BhY2VJbXBsOjpzdG9yYWdl QXJlYShQYXNzUmVmUHRyPFNlY3VyaXR5T3JpCiB7CiAgICAgYXV0byYgc2xvdCA9IG1fc3RvcmFn ZUFyZWFNYXBzLmFkZChzZWN1cml0eU9yaWdpbi5nZXQoKSwgbnVsbHB0cikuaXRlcmF0b3ItPnZh bHVlOwogICAgIGlmICghc2xvdCkKLSAgICAgICAgc2xvdCA9IFN0b3JhZ2VBcmVhTWFwOjpjcmVh dGUodGhpcywgc2VjdXJpdHlPcmlnaW4pOworICAgICAgICBzbG90ID0gU3RvcmFnZUFyZWFNYXA6 OmNyZWF0ZSh0aGlzLCAqc2VjdXJpdHlPcmlnaW4pOwogCiAgICAgcmV0dXJuIFN0b3JhZ2VBcmVh SW1wbDo6Y3JlYXRlKHNsb3QpOwogfQo=