163253 2016-10-10 16:35:58 -0700 Don't run SecurityOrigin's port through URLParser 2023-02-08 07:27:09 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen toddcarson876 oldest_to_newest 1238604 0 achristensen 2016-10-10 16:35:58 -0700 Don't run SecurityOrigin constructor parameters through URLParser 1238606 1 291183 achristensen 2016-10-10 16:37:40 -0700 Created attachment 291183 Patch 1238609 2 291183 beidson 2016-10-10 16:42:15 -0700 Comment on attachment 291183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291183&action=review > Source/WebCore/page/SecurityOrigin.cpp:-107 > - : m_protocol(url.protocol().isNull() ? emptyString() : url.protocol().convertToASCIILowercase()) > - , m_host(url.host().isNull() ? emptyString() : url.host().convertToASCIILowercase()) Empty vs null is important. Can't lose this. > Source/WebCore/page/SecurityOrigin.cpp:114 > + : m_protocol(protocol.convertToASCIILowercase()) > + , m_host(host.convertToASCIILowercase()) Ditto. > Source/WebCore/page/SecurityOrigin.h:235 > + String m_protocol { emptyString() }; > + String m_host { emptyString() }; > + String m_domain { emptyString() }; All constructors overwrite these defaults. I wonder if there's any scenarios where SecurityOrigin is hot enough that this is a concern (overriding them) I also wonder if the compiler optimizes that out anyways. I wonder... 1238621 3 291187 achristensen 2016-10-10 16:52:35 -0700 Created attachment 291187 Patch 1238626 4 achristensen 2016-10-10 16:54:45 -0700 http://trac.webkit.org/changeset/207033 291183 2016-10-10 16:37:40 -0700 2016-10-10 16:52:32 -0700 Patch bug-163253-20161010163419.patch text/plain 6168 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTEwLTEwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcnVu IFNlY3VyaXR5T3JpZ2luIGNvbnN0cnVjdG9yIHBhcmFtZXRlcnMgdGhyb3VnaCBVUkxQYXJzZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzI1Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5n ZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OlNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAg KFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjptYXliZUNyZWF0ZUZyb21EYXRhYmFzZUlkZW50aWZp ZXIpOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZSk6CisgICAgICAg ICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmln aW46OlNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAgVGhlIFNlY3VyaXR5T3JpZ2luIGNvbnN0cnVj dG9yIHVzZWQgdG8gcGFyc2UgYSBVUkwgdW5uZWNlc3NhcmlseS4KKyAgICAgICAgSXQgd291bGQg YWxzbyBwYXJzZSBVUkxzIGxpa2UgImZpbGU6Ly86MC8iIHdoaWNoIHVzZWQgdG8gYmUgdmFsaWQg YnV0IGFyZW4ndCB2YWxpZCB3aGVuCisgICAgICAgIHdlIHN0YXJ0IHVzaW5nIHRoZSBVUkxQYXJz ZXIsIHdoaWNoIG1hdGNoZXMgdGhlIHNwZWMgYW5kIG90aGVyIGJyb3dzZXJzJyBiZWhhdmlvci4K KwogMjAxNi0xMC0xMCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29t PgogCiAgICAgICAgIDxFcnJvcj46IENHQ29udGV4dFNldExpbmVEYXNoOiBpbnZhbGlkIGRhc2gg YXJyYXk6IGF0IGxlYXN0IG9uZSBlbGVtZW50IG11c3QgYmUgbm9uLXplcm8KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCShyZXZpc2lvbiAyMDY5MjApCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAz LDE1ICsxMDMsMTYgQEAgc3RhdGljIGJvb2wgc2hvdWxkVHJlYXRBc1VuaXF1ZU9yaWdpbihjbwog fQogCiBTZWN1cml0eU9yaWdpbjo6U2VjdXJpdHlPcmlnaW4oY29uc3QgVVJMJiB1cmwpCi0gICAg OiBtX3Byb3RvY29sKHVybC5wcm90b2NvbCgpLmlzTnVsbCgpID8gZW1wdHlTdHJpbmcoKSA6IHVy bC5wcm90b2NvbCgpLmNvbnZlcnRUb0FTQ0lJTG93ZXJjYXNlKCkpCi0gICAgLCBtX2hvc3QodXJs Lmhvc3QoKS5pc051bGwoKSA/IGVtcHR5U3RyaW5nKCkgOiB1cmwuaG9zdCgpLmNvbnZlcnRUb0FT Q0lJTG93ZXJjYXNlKCkpCi0gICAgLCBtX3BvcnQodXJsLnBvcnQoKSkKLSAgICAsIG1faXNVbmlx dWUoZmFsc2UpCi0gICAgLCBtX3VuaXZlcnNhbEFjY2VzcyhmYWxzZSkKLSAgICAsIG1fZG9tYWlu V2FzU2V0SW5ET00oZmFsc2UpCi0gICAgLCBtX3N0b3JhZ2VCbG9ja2luZ1BvbGljeShBbGxvd0Fs bFN0b3JhZ2UpCi0gICAgLCBtX2VuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24oZmFsc2UpCi0gICAg LCBtX25lZWRzRGF0YWJhc2VJZGVudGlmaWVyUXVpcmtGb3JGaWxlcyhmYWxzZSkKKyAgICA6IFNl Y3VyaXR5T3JpZ2luKHVybC5wcm90b2NvbCgpLCB1cmwuaG9zdCgpLCB1cmwucG9ydCgpKQorewor ICAgIGlmIChtX2NhbkxvYWRMb2NhbFJlc291cmNlcykKKyAgICAgICAgbV9maWxlUGF0aCA9IHVy bC5wYXRoKCk7IC8vIEluIGNhc2UgZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlvbigpIGlzIGNhbGxl ZC4KK30KKyAgICAKK1NlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBTdHJpbmcm IHByb3RvY29sLCBjb25zdCBTdHJpbmcmIGhvc3QsIHVpbnQxNl90IHBvcnQpCisgICAgOiBtX3By b3RvY29sKHByb3RvY29sLmNvbnZlcnRUb0FTQ0lJTG93ZXJjYXNlKCkpCisgICAgLCBtX2hvc3Qo aG9zdC5jb252ZXJ0VG9BU0NJSUxvd2VyY2FzZSgpKQorICAgICwgbV9wb3J0KHBvcnQpCiB7CiAg ICAgLy8gZG9jdW1lbnQuZG9tYWluIHN0YXJ0cyBhcyBtX2hvc3QsIGJ1dCBjYW4gYmUgc2V0IGJ5 IHRoZSBET00uCiAgICAgbV9kb21haW4gPSBtX2hvc3Q7CkBAIC0xMjEsMjQgKzEyMiw2IEBAIFNl Y3VyaXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBVUkwKIAogICAgIC8vIEJ5IGRlZmF1 bHQsIG9ubHkgbG9jYWwgU2VjdXJpdHlPcmlnaW5zIGNhbiBsb2FkIGxvY2FsIHJlc291cmNlcy4K ICAgICBtX2NhbkxvYWRMb2NhbFJlc291cmNlcyA9IGlzTG9jYWwoKTsKLQotICAgIGlmIChtX2Nh bkxvYWRMb2NhbFJlc291cmNlcykKLSAgICAgICAgbV9maWxlUGF0aCA9IHVybC5wYXRoKCk7IC8v IEluIGNhc2UgZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlvbigpIGlzIGNhbGxlZC4KLX0KLQotU2Vj dXJpdHlPcmlnaW46OlNlY3VyaXR5T3JpZ2luKCkKLSAgICA6IG1fcHJvdG9jb2woZW1wdHlTdHJp bmcoKSkKLSAgICAsIG1faG9zdChlbXB0eVN0cmluZygpKQotICAgICwgbV9kb21haW4oZW1wdHlT dHJpbmcoKSkKLSAgICAsIG1fcG9ydChJbnZhbGlkUG9ydCkKLSAgICAsIG1faXNVbmlxdWUodHJ1 ZSkKLSAgICAsIG1fdW5pdmVyc2FsQWNjZXNzKGZhbHNlKQotICAgICwgbV9kb21haW5XYXNTZXRJ bkRPTShmYWxzZSkKLSAgICAsIG1fY2FuTG9hZExvY2FsUmVzb3VyY2VzKGZhbHNlKQotICAgICwg bV9zdG9yYWdlQmxvY2tpbmdQb2xpY3koQWxsb3dBbGxTdG9yYWdlKQotICAgICwgbV9lbmZvcmNl RmlsZVBhdGhTZXBhcmF0aW9uKGZhbHNlKQotICAgICwgbV9uZWVkc0RhdGFiYXNlSWRlbnRpZmll clF1aXJrRm9yRmlsZXMoZmFsc2UpCi17CiB9CiAKIFNlY3VyaXR5T3JpZ2luOjpTZWN1cml0eU9y aWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiogb3RoZXIpCkBAIC01MjAsNyArNTAzLDcgQEAgUmVm UHRyPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6bQogICAgIFN0cmluZyBob3N0ID0g ZGF0YWJhc2VJZGVudGlmaWVyLnN1YnN0cmluZyhzZXBhcmF0b3IxICsgMSwgc2VwYXJhdG9yMiAt IHNlcGFyYXRvcjEgLSAxKTsKICAgICAKICAgICBob3N0ID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVu Y2VzKGhvc3QpOwotICAgIHJldHVybiBjcmVhdGUoVVJMKFVSTCgpLCBwcm90b2NvbCArICI6Ly8i ICsgaG9zdCArICI6IiArIFN0cmluZzo6bnVtYmVyKHBvcnQpICsgIi8iKSk7CisgICAgcmV0dXJu IGNyZWF0ZShwcm90b2NvbCwgaG9zdCwgcG9ydCk7CiB9CiAKIFJlZjxTZWN1cml0eU9yaWdpbj4g U2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21EYXRhYmFzZUlkZW50aWZpZXIoY29uc3QgU3RyaW5n JiBkYXRhYmFzZUlkZW50aWZpZXIpCkBAIC01MzUsNyArNTE4LDcgQEAgUmVmPFNlY3VyaXR5T3Jp Z2luPiBTZWN1cml0eU9yaWdpbjo6Y3JlYQogICAgIGlmIChwb3J0IDwgMCB8fCBwb3J0ID4gTWF4 QWxsb3dlZFBvcnQpCiAgICAgICAgIHJldHVybiBjcmVhdGVVbmlxdWUoKTsKICAgICBTdHJpbmcg ZGVjb2RlZEhvc3QgPSBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoaG9zdCk7Ci0gICAgcmV0dXJu IGNyZWF0ZShVUkwoVVJMKCksIHByb3RvY29sICsgIjovLyIgKyBob3N0ICsgIjoiICsgU3RyaW5n OjpudW1iZXIocG9ydCkgKyAiLyIpKTsKKyAgICByZXR1cm4gY3JlYXRlKHByb3RvY29sLCBob3N0 LCBwb3J0KTsKIH0KIAogU3RyaW5nIFNlY3VyaXR5T3JpZ2luOjpkYXRhYmFzZUlkZW50aWZpZXIo KSBjb25zdCAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgJKHJldmlzaW9u IDIwNjkyMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaAkod29ya2lu ZyBjb3B5KQpAQCAtMjYsOCArMjYsNyBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0jaWZuZGVmIFNl Y3VyaXR5T3JpZ2luX2gKLSNkZWZpbmUgU2VjdXJpdHlPcmlnaW5faAorI3ByYWdtYSBvbmNlCiAK ICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KQEAgLTIxMiw4ICsyMTEsMTIgQEAgcHVibGljOgogICAgIHN0YXRpYyBV UkwgdXJsV2l0aFVuaXF1ZVNlY3VyaXR5T3JpZ2luKCk7CiAKIHByaXZhdGU6Ci0gICAgU2VjdXJp dHlPcmlnaW4oKTsKKyAgICBTZWN1cml0eU9yaWdpbigpCisgICAgICAgIDogbV9pc1VuaXF1ZSh0 cnVlKQorICAgIHsKKyAgICB9CiAgICAgZXhwbGljaXQgU2VjdXJpdHlPcmlnaW4oY29uc3QgVVJM Jik7CisgICAgZXhwbGljaXQgU2VjdXJpdHlPcmlnaW4oY29uc3QgU3RyaW5nJiBwcm90b2NvbCwg Y29uc3QgU3RyaW5nJiBob3N0LCB1aW50MTZfdCBwb3J0KTsKICAgICBleHBsaWNpdCBTZWN1cml0 eU9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiopOwogCiAgICAgLy8gRklYTUU6IFJlbmFtZSB0 aGlzIGZ1bmN0aW9uIHRvIHNvbWV0aGluZyBtb3JlIHNlbWFudGljLgpAQCAtMjI3LDIwICsyMzAs MTggQEAgcHJpdmF0ZToKICAgICBlbnVtIFNob3VsZEFsbG93RnJvbVRoaXJkUGFydHkgeyBBbHdh eXNBbGxvd0Zyb21UaGlyZFBhcnR5LCBNYXliZUFsbG93RnJvbVRoaXJkUGFydHkgfTsKICAgICBX RUJDT1JFX0VYUE9SVCBib29sIGNhbkFjY2Vzc1N0b3JhZ2UoY29uc3QgU2VjdXJpdHlPcmlnaW4q LCBTaG91bGRBbGxvd0Zyb21UaGlyZFBhcnR5ID0gTWF5YmVBbGxvd0Zyb21UaGlyZFBhcnR5KSBj b25zdDsKIAotICAgIFN0cmluZyBtX3Byb3RvY29sOwotICAgIFN0cmluZyBtX2hvc3Q7Ci0gICAg U3RyaW5nIG1fZG9tYWluOworICAgIFN0cmluZyBtX3Byb3RvY29sIHsgZW1wdHlTdHJpbmcoKSB9 OworICAgIFN0cmluZyBtX2hvc3QgeyBlbXB0eVN0cmluZygpIH07CisgICAgU3RyaW5nIG1fZG9t YWluIHsgZW1wdHlTdHJpbmcoKSB9OwogICAgIFN0cmluZyBtX2ZpbGVQYXRoOwotICAgIHVuc2ln bmVkIHNob3J0IG1fcG9ydDsKLSAgICBib29sIG1faXNVbmlxdWU7Ci0gICAgYm9vbCBtX3VuaXZl cnNhbEFjY2VzczsKLSAgICBib29sIG1fZG9tYWluV2FzU2V0SW5ET007Ci0gICAgYm9vbCBtX2Nh bkxvYWRMb2NhbFJlc291cmNlczsKLSAgICBTdG9yYWdlQmxvY2tpbmdQb2xpY3kgbV9zdG9yYWdl QmxvY2tpbmdQb2xpY3k7Ci0gICAgYm9vbCBtX2VuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb247Ci0g ICAgYm9vbCBtX25lZWRzRGF0YWJhc2VJZGVudGlmaWVyUXVpcmtGb3JGaWxlczsKKyAgICB1aW50 MTZfdCBtX3BvcnQ7CisgICAgYm9vbCBtX2lzVW5pcXVlIHsgZmFsc2UgfTsKKyAgICBib29sIG1f dW5pdmVyc2FsQWNjZXNzIHsgZmFsc2UgfTsKKyAgICBib29sIG1fZG9tYWluV2FzU2V0SW5ET00g eyBmYWxzZSB9OworICAgIGJvb2wgbV9jYW5Mb2FkTG9jYWxSZXNvdXJjZXMgeyBmYWxzZSB9Owor ICAgIFN0b3JhZ2VCbG9ja2luZ1BvbGljeSBtX3N0b3JhZ2VCbG9ja2luZ1BvbGljeSB7IEFsbG93 QWxsU3RvcmFnZSB9OworICAgIGJvb2wgbV9lbmZvcmNlRmlsZVBhdGhTZXBhcmF0aW9uIHsgZmFs c2UgfTsKKyAgICBib29sIG1fbmVlZHNEYXRhYmFzZUlkZW50aWZpZXJRdWlya0ZvckZpbGVzIHsg ZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlmIC8vIFNlY3Vy aXR5T3JpZ2luX2gK 291187 2016-10-10 16:52:35 -0700 2016-10-10 16:53:55 -0700 Patch bug-163253-20161010164914.patch text/plain 2336 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzAzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTEwLTEwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcnVu IFNlY3VyaXR5T3JpZ2luJ3MgcG9ydCB0aHJvdWdoIFVSTFBhcnNlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMjUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLgor CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbjo6bWF5YmVDcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUpOgorICAgICAgICBXZSB1c2VkIHRv IHBhcnNlIFVSTHMgbGlrZSAiZmlsZTovLzowLyIgd2hpY2ggYXJlIHZhbGlkIHdoZW4gdXNpbmcg VVJMOjpwYXJzZQorICAgICAgICBidXQgYXJlbid0IHZhbGlkIHdoZW4gd2Ugc3RhcnQgdXNpbmcg dGhlIFVSTFBhcnNlciwgd2hpY2ggbWF0Y2hlcyBvdGhlciBicm93c2VycycgZmFpbHVyZQorICAg ICAgICB0byBwYXJzZSBVUkxzIHdpdGggYSBwb3J0IGJ1dCBubyBob3N0LiBUaGVyZSBpcyBubyBy ZWFzb24gdG8gd3JpdGUgYW5kIHBhcnNlIHRoZSBwb3J0LgorICAgICAgICBTZXR0aW5nIG1fcG9y dCBkaXJlY3RseSBhY2NvbXBsaXNoZXMgdGhlIHNhbWUgdGhpbmcuCisgCiAyMDE2LTEwLTEwICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgPEVy cm9yPjogQ0dDb250ZXh0U2V0TGluZURhc2g6IGludmFsaWQgZGFzaCBhcnJheTogYXQgbGVhc3Qg b25lIGVsZW1lbnQgbXVzdCBiZSBub24temVybwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9T ZWN1cml0eU9yaWdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1 cml0eU9yaWdpbi5jcHAJKHJldmlzaW9uIDIwNjkyMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv U2VjdXJpdHlPcmlnaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjAsNyArNTIwLDkgQEAgUmVm UHRyPFNlY3VyaXR5T3JpZ2luPiBTZWN1cml0eU9yaWdpbjo6bQogICAgIFN0cmluZyBob3N0ID0g ZGF0YWJhc2VJZGVudGlmaWVyLnN1YnN0cmluZyhzZXBhcmF0b3IxICsgMSwgc2VwYXJhdG9yMiAt IHNlcGFyYXRvcjEgLSAxKTsKICAgICAKICAgICBob3N0ID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVu Y2VzKGhvc3QpOwotICAgIHJldHVybiBjcmVhdGUoVVJMKFVSTCgpLCBwcm90b2NvbCArICI6Ly8i ICsgaG9zdCArICI6IiArIFN0cmluZzo6bnVtYmVyKHBvcnQpICsgIi8iKSk7CisgICAgYXV0byBv cmlnaW4gPSBjcmVhdGUoVVJMKFVSTCgpLCBwcm90b2NvbCArICI6Ly8iICsgaG9zdCArICIvIikp OworICAgIG9yaWdpbi0+bV9wb3J0ID0gcG9ydDsKKyAgICByZXR1cm4gV1RGTW92ZShvcmlnaW4p OwogfQogCiBSZWY8U2VjdXJpdHlPcmlnaW4+IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tRGF0 YWJhc2VJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VJZGVudGlmaWVyKQpAQCAtNTM1 LDcgKzUzNyw5IEBAIFJlZjxTZWN1cml0eU9yaWdpbj4gU2VjdXJpdHlPcmlnaW46OmNyZWEKICAg ICBpZiAocG9ydCA8IDAgfHwgcG9ydCA+IE1heEFsbG93ZWRQb3J0KQogICAgICAgICByZXR1cm4g Y3JlYXRlVW5pcXVlKCk7CiAgICAgU3RyaW5nIGRlY29kZWRIb3N0ID0gZGVjb2RlVVJMRXNjYXBl U2VxdWVuY2VzKGhvc3QpOwotICAgIHJldHVybiBjcmVhdGUoVVJMKFVSTCgpLCBwcm90b2NvbCAr ICI6Ly8iICsgaG9zdCArICI6IiArIFN0cmluZzo6bnVtYmVyKHBvcnQpICsgIi8iKSk7CisgICAg YXV0byBvcmlnaW4gPSBjcmVhdGUoVVJMKFVSTCgpLCBwcm90b2NvbCArICI6Ly8iICsgaG9zdCAr ICIvIikpOworICAgIG9yaWdpbi0+bV9wb3J0ID0gcG9ydDsKKyAgICByZXR1cm4gb3JpZ2luOwog fQogCiBTdHJpbmcgU2VjdXJpdHlPcmlnaW46OmRhdGFiYXNlSWRlbnRpZmllcigpIGNvbnN0IAo=