162864 2016-10-03 08:21:03 -0700 URLParser: empty relative URLs should not copy fragment from the base URL 2016-10-03 10:31:04 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1235777 0 achristensen 2016-10-03 08:21:03 -0700 URLParser: empty relative URLs should not copy fragment from the base URL 1235778 1 290484 achristensen 2016-10-03 08:24:15 -0700 Created attachment 290484 Patch 1235781 2 290486 achristensen 2016-10-03 09:04:38 -0700 Created attachment 290486 Patch 1235803 3 290486 cdumez 2016-10-03 10:13:41 -0700 Comment on attachment 290486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290486&action=review > Source/WebCore/platform/URL.cpp:1115 > + m_string = m_string.substring(0, m_queryEnd); Seems like this should be m_string.left(m_queryEnd) as in the original code. > Source/WebCore/platform/URLParser.cpp:770 > + RELEASE_ASSERT(length <= string.length()); This assertion is already present at the beginning of the function. Should probably be dropped here. > Source/WebCore/platform/URLParser.cpp:1082 > + && m_url.m_string == base.m_string.substring(0, base.m_queryEnd))); substring() -> left() This allocates the String unnecessarily. I understand this is an assertion but it'd still be nice to use a StringView. 1235808 4 achristensen 2016-10-03 10:31:04 -0700 I don't particularly like the name "left" but done. https://trac.webkit.org/changeset/206735 290484 2016-10-03 08:24:15 -0700 2016-10-03 09:04:36 -0700 Patch bug-162864-20161003082108.patch text/plain 9770 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjcwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE2LTEwLTAzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy OiBlbXB0eSByZWxhdGl2ZSBVUkxzIHNob3VsZCBub3QgY29weSBmcmFnbWVudCBmcm9tIHRoZSBi YXNlIFVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYyODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q292ZXJlZCBieSBuZXcgQVBJIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vVVJMLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlVSTDo6cmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKToKKyAgICAg ICAgT3B0aW1pemUgcmVtb3ZpbmcgZnJhZ21lbnRzLCBub3cgdGhhdCBpdCBoYXBwZW5zIG1vcmUg b2Z0ZW4uIFdlIGRvbid0IG5lZWQgdG8gcmVwYXJzZSwgCisgICAgICAgIGJlY2F1c2UgdGhlIHJl c3VsdCB3aWxsIGFsd2F5cyBiZSBlcXVhbCB0byBqdXN0IGEgc3Vic3RyaW5nIHdoZW4gcmVtb3Zp bmcgdGhlIGZyYWdtZW50IGF0IHRoZSBlbmQuCisgICAgICAgICogcGxhdGZvcm0vVVJMUGFyc2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVSTFBhcnNlcjo6Y29weUFTQ0lJU3RyaW5nVW50aWwp OgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2VyOjpjb3B5VVJMUGFydHNVbnRpbCk6CisgICAg ICAgIChXZWJDb3JlOjpjb250YWluc09ubHlDMENvbnRyb2xPclNwYWNlKToKKyAgICAgICAgKFdl YkNvcmU6OlVSTFBhcnNlcjo6VVJMUGFyc2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlVSTFBhcnNl cjo6cGFyc2UpOgorICAgICAgICAqIHBsYXRmb3JtL1VSTFBhcnNlci5oOgorICAgICAgICBCZWNh dXNlIHdlIGFyZSBub3QgY29weWluZyB0aGUgZnJhZ21lbnQsIHdlIGNhbiBzaW1wbGlmeSBhbmQg cmVtb3ZlIHNvbWUgdW5yZWFjaGFibGUgY29kZS4KKwogMjAxNi0wOS0zMCAgRGF2aWQgS2lsemVy ICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMDM0MjQpOiBX ZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJsZUJ1ZmZlcigpIGluIEltYWdlQnVm ZmVyQ0cuY3BwIG92ZXItcmVsZWFzZXMgQ0dDb2xvclNwYWNlUmVmIG9iamVjdHMKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vVVJMLmNwcAkocmV2aXNpb24gMjA2NjMwKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vVVJMLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEwNiwxNCArMTEwNiwxNCBAQCB2 b2lkIFVSTDo6c2V0RnJhZ21lbnRJZGVudGlmaWVyKGNvbnN0IFN0CiAKIHZvaWQgVVJMOjpyZW1v dmVGcmFnbWVudElkZW50aWZpZXIoKQogewotICAgIGlmICghbV9pc1ZhbGlkKQorICAgIGlmICgh bV9pc1ZhbGlkKSB7CisgICAgICAgIEFTU0VSVCghbV9mcmFnbWVudEVuZCk7CisgICAgICAgIEFT U0VSVCghbV9xdWVyeUVuZCk7CiAgICAgICAgIHJldHVybjsKLSAgICBpZiAoVVJMUGFyc2VyOjpl bmFibGVkKCkpIHsKLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCBuZWVkIHRvIHBhcnNl IGhlcmUuCi0gICAgICAgIFVSTFBhcnNlciBwYXJzZXIobV9zdHJpbmcubGVmdChtX3F1ZXJ5RW5k KSk7Ci0gICAgICAgICp0aGlzID0gcGFyc2VyLnJlc3VsdCgpOwotICAgIH0gZWxzZQotICAgICAg ICBwYXJzZShtX3N0cmluZy5sZWZ0KG1fcXVlcnlFbmQpKTsKKyAgICB9CisgICAgaWYgKG1fZnJh Z21lbnRFbmQgPiBtX3F1ZXJ5RW5kKQorICAgICAgICBtX3N0cmluZyA9IG1fc3RyaW5nLnN1YnN0 cmluZygwLCBtX3F1ZXJ5RW5kKTsKKyAgICBtX2ZyYWdtZW50RW5kID0gbV9xdWVyeUVuZDsKIH0K ICAgICAKIHZvaWQgVVJMOjpzZXRRdWVyeShjb25zdCBTdHJpbmcmIHF1ZXJ5KQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDY2NTApCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NTgs MjEgKzc1OCwxOCBAQCBzaXplX3QgVVJMUGFyc2VyOjp1cmxMZW5ndGhVbnRpbFBhcnQoY29uCiAg ICAgcmV0dXJuIDA7CiB9CiAKLXZvaWQgVVJMUGFyc2VyOjpjb3B5QVNDSUlTdHJpbmdVbnRpbChj b25zdCBTdHJpbmcmIHN0cmluZywgc2l6ZV90IGxlbmd0aElmOEJpdCwgc2l6ZV90IGxlbmd0aElm MTZCaXQpCit2b2lkIFVSTFBhcnNlcjo6Y29weUFTQ0lJU3RyaW5nVW50aWwoY29uc3QgU3RyaW5n JiBzdHJpbmcsIHNpemVfdCBsZW5ndGgpCiB7Ci0gICAgaWYgKHN0cmluZy5pc051bGwoKSkgewot ICAgICAgICBBU1NFUlQoIWxlbmd0aElmOEJpdCk7Ci0gICAgICAgIEFTU0VSVCghbGVuZ3RoSWYx NkJpdCk7CisgICAgUkVMRUFTRV9BU1NFUlQobGVuZ3RoIDw9IHN0cmluZy5sZW5ndGgoKSk7Cisg ICAgaWYgKHN0cmluZy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICBBU1NF UlQobV9hc2NpaUJ1ZmZlci5pc0VtcHR5KCkpOwogICAgIGlmIChzdHJpbmcuaXM4Qml0KCkpIHsK LSAgICAgICAgUkVMRUFTRV9BU1NFUlQobGVuZ3RoSWY4Qml0IDw9IHN0cmluZy5sZW5ndGgoKSk7 Ci0gICAgICAgIGFwcGVuZFRvQVNDSUlCdWZmZXIoc3RyaW5nLmNoYXJhY3RlcnM4KCksIGxlbmd0 aElmOEJpdCk7CisgICAgICAgIGFwcGVuZFRvQVNDSUlCdWZmZXIoc3RyaW5nLmNoYXJhY3RlcnM4 KCksIGxlbmd0aCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQobGVuZ3Ro SWYxNkJpdCA8PSBzdHJpbmcubGVuZ3RoKCkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVChsZW5n dGggPD0gc3RyaW5nLmxlbmd0aCgpKTsKICAgICAgICAgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMg PSBzdHJpbmcuY2hhcmFjdGVyczE2KCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bGVuZ3RoSWYxNkJpdDsgKytpKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVu Z3RoOyArK2kpIHsKICAgICAgICAgICAgIFVDaGFyIGMgPSBjaGFyYWN0ZXJzW2ldOwogICAgICAg ICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaXNBU0NJSShjKSk7CiAgICAg ICAgICAgICBhcHBlbmRUb0FTQ0lJQnVmZmVyKGMpOwpAQCAtNzg3LDI4ICs3ODQsMTAgQEAgdm9p ZCBVUkxQYXJzZXI6OmNvcHlVUkxQYXJ0c1VudGlsKGNvbnN0IAogCiAgICAgbV9hc2NpaUJ1ZmZl ci5jbGVhcigpOwogICAgIG1fdW5pY29kZUZyYWdtZW50QnVmZmVyLmNsZWFyKCk7Ci0gICAgaWYg KHBhcnQgPT0gVVJMUGFydDo6RnJhZ21lbnRFbmQpIHsKLSAgICAgICAgY29weUFTQ0lJU3RyaW5n VW50aWwoYmFzZS5tX3N0cmluZywgdXJsTGVuZ3RoVW50aWxQYXJ0KGJhc2UsIFVSTFBhcnQ6OkZy YWdtZW50RW5kKSwgdXJsTGVuZ3RoVW50aWxQYXJ0KGJhc2UsIFVSTFBhcnQ6OlF1ZXJ5RW5kKSk7 Ci0gICAgICAgIGlmICghYmFzZS5tX3N0cmluZy5pczhCaXQoKSkgewotICAgICAgICAgICAgY29u c3QgU3RyaW5nJiBmcmFnbWVudCA9IGJhc2UubV9zdHJpbmc7Ci0gICAgICAgICAgICBib29sIHNl ZW5Vbmljb2RlID0gZmFsc2U7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gYmFzZS5tX3F1 ZXJ5RW5kOyBpIDwgYmFzZS5tX2ZyYWdtZW50RW5kOyArK2kpIHsKLSAgICAgICAgICAgICAgICBp ZiAoIXNlZW5Vbmljb2RlICYmICFpc0FTQ0lJKGZyYWdtZW50W2ldKSkKLSAgICAgICAgICAgICAg ICAgICAgc2VlblVuaWNvZGUgPSB0cnVlOwotICAgICAgICAgICAgICAgIGlmIChzZWVuVW5pY29k ZSkKLSAgICAgICAgICAgICAgICAgICAgbV91bmljb2RlRnJhZ21lbnRCdWZmZXIudW5jaGVja2Vk QXBwZW5kKGZyYWdtZW50W2ldKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgICAgIG1fYXNjaWlCdWZmZXIudW5jaGVja2VkQXBwZW5kKGZyYWdtZW50W2ldKTsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIHNpemVfdCBsZW5ndGgg PSB1cmxMZW5ndGhVbnRpbFBhcnQoYmFzZSwgcGFydCk7Ci0gICAgICAgIGNvcHlBU0NJSVN0cmlu Z1VudGlsKGJhc2UubV9zdHJpbmcsIGxlbmd0aCwgbGVuZ3RoKTsKLSAgICB9CisgICAgY29weUFT Q0lJU3RyaW5nVW50aWwoYmFzZS5tX3N0cmluZywgdXJsTGVuZ3RoVW50aWxQYXJ0KGJhc2UsIHBh cnQpKTsKICAgICBzd2l0Y2ggKHBhcnQpIHsKICAgICBjYXNlIFVSTFBhcnQ6OkZyYWdtZW50RW5k OgotICAgICAgICBtX3VybC5tX2ZyYWdtZW50RW5kID0gYmFzZS5tX2ZyYWdtZW50RW5kOwotICAg ICAgICBGQUxMVEhST1VHSDsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICBjYXNlIFVSTFBhcnQ6OlF1ZXJ5RW5kOgogICAgICAgICBtX3VybC5tX3F1ZXJ5RW5kID0g YmFzZS5tX3F1ZXJ5RW5kOwogICAgICAgICBGQUxMVEhST1VHSDsKQEAgLTEwNzgsMTIgKzEwNTcs MjMgQEAgQUxXQVlTX0lOTElORSBzaXplX3QgVVJMUGFyc2VyOjpjdXJyZW50UAogICAgIHJldHVy biBpdGVyYXRvci5jb2RlVW5pdHNTaW5jZShyZWludGVycHJldF9jYXN0PGNvbnN0IENoYXJhY3Rl clR5cGUqPihtX2lucHV0QmVnaW4pKTsKIH0KIAorc3RhdGljIGJvb2wgY29udGFpbnNPbmx5QzBD b250cm9sT3JTcGFjZShjb25zdCBTdHJpbmcmIHN0cmluZykKK3sKKyAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IHN0cmluZy5sZW5ndGgoKTsgKytpKSB7CisgICAgICAgIGlmICghaXNDMENvbnRy b2xPclNwYWNlKHN0cmluZ1tpXSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQor ICAgIHJldHVybiB0cnVlOworfQorCiBVUkxQYXJzZXI6OlVSTFBhcnNlcihjb25zdCBTdHJpbmcm IGlucHV0LCBjb25zdCBVUkwmIGJhc2UsIGNvbnN0IFRleHRFbmNvZGluZyYgZW5jb2RpbmcpCiAg ICAgOiBtX2lucHV0U3RyaW5nKGlucHV0KQogewogICAgIGlmIChpbnB1dC5pc051bGwoKSkgewot ICAgICAgICBpZiAoYmFzZS5pc1ZhbGlkKCkgJiYgIWJhc2UubV9jYW5ub3RCZUFCYXNlVVJMKQor ICAgICAgICBpZiAoYmFzZS5pc1ZhbGlkKCkgJiYgIWJhc2UubV9jYW5ub3RCZUFCYXNlVVJMKSB7 CiAgICAgICAgICAgICBtX3VybCA9IGJhc2U7CisgICAgICAgICAgICBtX3VybC5yZW1vdmVGcmFn bWVudElkZW50aWZpZXIoKTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQogCkBA IC0xMDk3LDcgKzEwODcsOCBAQCBVUkxQYXJzZXI6OlVSTFBhcnNlcihjb25zdCBTdHJpbmcmIGlu cHV0CiAKICAgICBBU1NFUlQoIW1fdXJsLm1faXNWYWxpZAogICAgICAgICB8fCBtX2RpZFNlZVN5 bnRheFZpb2xhdGlvbiA9PSAobV91cmwuc3RyaW5nKCkgIT0gaW5wdXQpCi0gICAgICAgIHx8IChp bnB1dC5pc0VtcHR5KCkgJiYgbV91cmwubV9zdHJpbmcgPT0gYmFzZS5tX3N0cmluZykpOworICAg ICAgICB8fCAoY29udGFpbnNPbmx5QzBDb250cm9sT3JTcGFjZShpbnB1dCkKKyAgICAgICAgICAg ICYmIG1fdXJsLm1fc3RyaW5nID09IGJhc2UubV9zdHJpbmcuc3Vic3RyaW5nKDAsIGJhc2UubV9x dWVyeUVuZCkpKTsKICAgICBBU1NFUlQoaW50ZXJuYWxWYWx1ZXNDb25zaXN0ZW50KG1fdXJsKSk7 CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGlmICghbV9kaWRTZWVTeW50YXhWaW9sYXRpb24p IHsKQEAgLTE3NTUsNiArMTc0Niw3IEBAIHZvaWQgVVJMUGFyc2VyOjpwYXJzZShjb25zdCBDaGFy YWN0ZXJUeXAKICAgICAgICAgTE9HX0ZJTkFMX1NUQVRFKCJTY2hlbWVTdGFydCIpOwogICAgICAg ICBpZiAoIWN1cnJlbnRQb3NpdGlvbihjKSAmJiBiYXNlLmlzVmFsaWQoKSAmJiAhYmFzZS5tX2Nh bm5vdEJlQUJhc2VVUkwpIHsKICAgICAgICAgICAgIG1fdXJsID0gYmFzZTsKKyAgICAgICAgICAg IG1fdXJsLnJlbW92ZUZyYWdtZW50SWRlbnRpZmllcigpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAgICAgICAgIGZhaWx1cmUoKTsKQEAgLTE3ODgsOCArMTc4MCw3IEBAIHZvaWQg VVJMUGFyc2VyOjpwYXJzZShjb25zdCBDaGFyYWN0ZXJUeXAKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBTdGF0ZTo6UmVsYXRpdmU6CiAgICAgICAgIExPR19GSU5BTF9TVEFURSgiUmVsYXRpdmUi KTsKLSAgICAgICAgY29weVVSTFBhcnRzVW50aWwoYmFzZSwgVVJMUGFydDo6RnJhZ21lbnRFbmQs IGMpOwotICAgICAgICBicmVhazsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICBjYXNlIFN0YXRlOjpSZWxhdGl2ZVNsYXNoOgogICAgICAgICBMT0dfRklOQUxfU1RB VEUoIlJlbGF0aXZlU2xhc2giKTsKICAgICAgICAgY29weVVSTFBhcnRzVW50aWwoYmFzZSwgVVJM UGFydDo6UG9ydEVuZCwgYyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJz ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuaAko cmV2aXNpb24gMjA2NjQ4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFyc2VyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTkzLDcgKzkzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGVu ZFRvQVNDSUlCdWZmZXIoY29uc3QgY2hhciosIHNpemVfdCk7CiAgICAgdm9pZCBhcHBlbmRUb0FT Q0lJQnVmZmVyKGNvbnN0IExDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3Qgc2l6ZSkgeyBhcHBlbmRU b0FTQ0lJQnVmZmVyKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGNoYXJhY3RlcnMpLCBz aXplKTsgfQogICAgIHRlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IHZvaWQgZW5jb2Rl UXVlcnkoY29uc3QgVmVjdG9yPFVDaGFyPiYgc291cmNlLCBjb25zdCBUZXh0RW5jb2RpbmcmLCBD b2RlUG9pbnRJdGVyYXRvcjxDaGFyYWN0ZXJUeXBlPik7Ci0gICAgdm9pZCBjb3B5QVNDSUlTdHJp bmdVbnRpbChjb25zdCBTdHJpbmcmLCBzaXplX3QgbGVuZ3RoSWY4Qml0LCBzaXplX3QgbGVuZ3Ro SWYxNkJpdCk7CisgICAgdm9pZCBjb3B5QVNDSUlTdHJpbmdVbnRpbChjb25zdCBTdHJpbmcmLCBz aXplX3QgbGVuZ3RoKTsKICAgICBTdHJpbmdWaWV3IHBhcnNlZERhdGFWaWV3KHNpemVfdCBzdGFy dCwgc2l6ZV90IGxlbmd0aCk7CiAKICAgICB1c2luZyBJUHY0QWRkcmVzcyA9IHVpbnQzMl90OwpJ bmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gMjA2NzMyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTMgQEAKKzIwMTYtMTAtMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KKworICAgICAgICBVUkxQYXJzZXI6IGVtcHR5IHJlbGF0aXZlIFVSTHMgc2hvdWxk IG5vdCBjb3B5IGZyYWdtZW50IGZyb20gdGhlIGJhc2UgVVJMCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjI4NjQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29y ZS9VUkxQYXJzZXIuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKwogMjAx Ni0xMC0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW1NPVVBdIENsZWFudXAgcGVyc2lzdGVudCBjcmVkZW50aWFsIHN0b3JhZ2UgY29kZQpJ bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VSTFBhcnNlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VSTFBhcnNlci5j cHAJKHJldmlzaW9uIDIwNjY1MCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29y ZS9VUkxQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDQsNiArNDA0LDExIEBAIFRFU1Rf RihVUkxQYXJzZXJUZXN0LCBQYXJzZVJlbGF0aXZlKQogICAgIGNoZWNrUmVsYXRpdmVVUkwoU3Ry aW5nKCksICJodHRwOi8vd2Via2l0Lm9yZy8iLCB7Imh0dHAiLCAiIiwgIiIsICJ3ZWJraXQub3Jn IiwgMCwgIi8iLCAiIiwgIiIsICJodHRwOi8vd2Via2l0Lm9yZy8ifSk7CiAgICAgY2hlY2tSZWxh dGl2ZVVSTCgiaHR0cHM6Ly9AdGVzdEB0ZXN0QGV4YW1wbGU6ODAwXFxwYXRoQGVuZCIsICJodHRw Oi8vZG9lc25vdG1hdHRlci8iLCB7IiIsICIiLCAiIiwgIiIsIDAsICIiLCAiIiwgIiIsICJodHRw czovL0B0ZXN0QHRlc3RAZXhhbXBsZTo4MDBcXHBhdGhAZW5kIn0pOwogICAgIGNoZWNrUmVsYXRp dmVVUkwoImh0dHA6Ly9mOjAvYyIsICJodHRwOi8vZXhhbXBsZS5vcmcvZm9vL2JhciIsIHsiaHR0 cCIsICIiLCAiIiwgImYiLCAwLCAiL2MiLCAiIiwgIiIsICJodHRwOi8vZjowL2MifSk7CisgICAg Y2hlY2tSZWxhdGl2ZVVSTChTdHJpbmcoKSwgImh0dHA6Ly9ob3N0LyNmcmFnbWVudCIsIHsiaHR0 cCIsICIiLCAiIiwgImhvc3QiLCAwLCAiLyIsICIiLCAiIiwgImh0dHA6Ly9ob3N0LyJ9KTsKKyAg ICBjaGVja1JlbGF0aXZlVVJMKCIiLCAiaHR0cDovL2hvc3QvI2ZyYWdtZW50IiwgeyJodHRwIiwg IiIsICIiLCAiaG9zdCIsIDAsICIvIiwgIiIsICIiLCAiaHR0cDovL2hvc3QvIn0pOworICAgIGNo ZWNrUmVsYXRpdmVVUkwoIiAgIiwgImh0dHA6Ly9ob3N0LyNmcmFnbWVudCIsIHsiaHR0cCIsICIi LCAiIiwgImhvc3QiLCAwLCAiLyIsICIiLCAiIiwgImh0dHA6Ly9ob3N0LyJ9KTsKKyAgICBjaGVj a1JlbGF0aXZlVVJMKCIgICIsICJodHRwOi8vaG9zdC9wYXRoP3F1ZXJ5I2ZyYSNnbWVudCIsIHsi aHR0cCIsICIiLCAiIiwgImhvc3QiLCAwLCAiL3BhdGgiLCAicXVlcnkiLCAiIiwgImh0dHA6Ly9o b3N0L3BhdGg/cXVlcnkifSk7CisgICAgY2hlY2tSZWxhdGl2ZVVSTCgiIFxhICIsICJodHRwOi8v aG9zdC8jZnJhZ21lbnQiLCB7Imh0dHAiLCAiIiwgIiIsICJob3N0IiwgMCwgIi8iLCAiIiwgIiIs ICJodHRwOi8vaG9zdC8ifSk7CiAKICAgICAvLyBUaGUgY2hlY2tpbmcgb2Ygc2xhc2hlcyBpbiBT cGVjaWFsQXV0aG9yaXR5U2xhc2hlcyBuZWVkZWQgdG8gZ2V0IHRoaXMgdG8gcGFzcyBjb250cmFk aWN0cyB3aGF0IGlzIGluIHRoZSBzcGVjLAogICAgIC8vIGJ1dCBpdCBpcyBpbmNsdWRlZCBpbiB0 aGUgd2ViIHBsYXRmb3JtIHRlc3RzLgo= 290486 2016-10-03 09:04:38 -0700 2016-10-03 10:13:41 -0700 Patch bug-162864-20161003090132.patch text/plain 9297 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjczMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE2LTEwLTAzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVVJMUGFyc2Vy OiBlbXB0eSByZWxhdGl2ZSBVUkxzIHNob3VsZCBub3QgY29weSBmcmFnbWVudCBmcm9tIHRoZSBi YXNlIFVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYyODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q292ZXJlZCBieSBuZXcgQVBJIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vVVJMLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlVSTDo6cmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKToKKyAgICAg ICAgT3B0aW1pemUgcmVtb3ZpbmcgZnJhZ21lbnRzLCBub3cgdGhhdCBpdCBoYXBwZW5zIG1vcmUg b2Z0ZW4uIFdlIGRvbid0IG5lZWQgdG8gcmVwYXJzZSwgCisgICAgICAgIGJlY2F1c2UgdGhlIHJl c3VsdCB3aWxsIGFsd2F5cyBiZSBlcXVhbCB0byBqdXN0IGEgc3Vic3RyaW5nIHdoZW4gcmVtb3Zp bmcgdGhlIGZyYWdtZW50IGF0IHRoZSBlbmQuCisgICAgICAgICogcGxhdGZvcm0vVVJMUGFyc2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVSTFBhcnNlcjo6Y29weUFTQ0lJU3RyaW5nVW50aWwp OgorICAgICAgICAoV2ViQ29yZTo6VVJMUGFyc2VyOjpjb3B5VVJMUGFydHNVbnRpbCk6CisgICAg ICAgIChXZWJDb3JlOjpjb250YWluc09ubHlDMENvbnRyb2xPclNwYWNlKToKKyAgICAgICAgKFdl YkNvcmU6OlVSTFBhcnNlcjo6VVJMUGFyc2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlVSTFBhcnNl cjo6cGFyc2UpOgorICAgICAgICAqIHBsYXRmb3JtL1VSTFBhcnNlci5oOgorICAgICAgICBCZWNh dXNlIHdlIGFyZSBub3QgY29weWluZyB0aGUgZnJhZ21lbnQsIHdlIGNhbiBzaW1wbGlmeSBhbmQg cmVtb3ZlIHNvbWUgdW5yZWFjaGFibGUgY29kZS4KKwogMjAxNi0xMC0wMyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NPVVBdIFNpbXBsaWZ5 IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V UkwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHJl dmlzaW9uIDIwNjczMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTExMDYsMTQgKzExMDYsMTQgQEAgdm9pZCBVUkw6OnNldEZyYWdtZW50SWRl bnRpZmllcihjb25zdCBTdAogCiB2b2lkIFVSTDo6cmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCkK IHsKLSAgICBpZiAoIW1faXNWYWxpZCkKKyAgICBpZiAoIW1faXNWYWxpZCkgeworICAgICAgICBB U1NFUlQoIW1fZnJhZ21lbnRFbmQpOworICAgICAgICBBU1NFUlQoIW1fcXVlcnlFbmQpOwogICAg ICAgICByZXR1cm47Ci0gICAgaWYgKFVSTFBhcnNlcjo6ZW5hYmxlZCgpKSB7Ci0gICAgICAgIC8v IEZJWE1FOiBXZSBzaG91bGRuJ3QgbmVlZCB0byBwYXJzZSBoZXJlLgotICAgICAgICBVUkxQYXJz ZXIgcGFyc2VyKG1fc3RyaW5nLmxlZnQobV9xdWVyeUVuZCkpOwotICAgICAgICAqdGhpcyA9IHBh cnNlci5yZXN1bHQoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgcGFyc2UobV9zdHJpbmcubGVmdCht X3F1ZXJ5RW5kKSk7CisgICAgfQorICAgIGlmIChtX2ZyYWdtZW50RW5kID4gbV9xdWVyeUVuZCkK KyAgICAgICAgbV9zdHJpbmcgPSBtX3N0cmluZy5zdWJzdHJpbmcoMCwgbV9xdWVyeUVuZCk7Cisg ICAgbV9mcmFnbWVudEVuZCA9IG1fcXVlcnlFbmQ7CiB9CiAgICAgCiB2b2lkIFVSTDo6c2V0UXVl cnkoY29uc3QgU3RyaW5nJiBxdWVyeSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VS TFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFy c2VyLmNwcAkocmV2aXNpb24gMjA2NzMyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJM UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzU4LDIxICs3NTgsMTggQEAgc2l6ZV90IFVS TFBhcnNlcjo6dXJsTGVuZ3RoVW50aWxQYXJ0KGNvbgogICAgIHJldHVybiAwOwogfQogCi12b2lk IFVSTFBhcnNlcjo6Y29weUFTQ0lJU3RyaW5nVW50aWwoY29uc3QgU3RyaW5nJiBzdHJpbmcsIHNp emVfdCBsZW5ndGhJZjhCaXQsIHNpemVfdCBsZW5ndGhJZjE2Qml0KQordm9pZCBVUkxQYXJzZXI6 OmNvcHlBU0NJSVN0cmluZ1VudGlsKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBzaXplX3QgbGVuZ3Ro KQogewotICAgIGlmIChzdHJpbmcuaXNOdWxsKCkpIHsKLSAgICAgICAgQVNTRVJUKCFsZW5ndGhJ ZjhCaXQpOwotICAgICAgICBBU1NFUlQoIWxlbmd0aElmMTZCaXQpOworICAgIFJFTEVBU0VfQVNT RVJUKGxlbmd0aCA8PSBzdHJpbmcubGVuZ3RoKCkpOworICAgIGlmIChzdHJpbmcuaXNOdWxsKCkp CiAgICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgQVNTRVJUKG1fYXNjaWlCdWZmZXIuaXNFbXB0 eSgpKTsKICAgICBpZiAoc3RyaW5nLmlzOEJpdCgpKSB7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJU KGxlbmd0aElmOEJpdCA8PSBzdHJpbmcubGVuZ3RoKCkpOwotICAgICAgICBhcHBlbmRUb0FTQ0lJ QnVmZmVyKHN0cmluZy5jaGFyYWN0ZXJzOCgpLCBsZW5ndGhJZjhCaXQpOworICAgICAgICBhcHBl bmRUb0FTQ0lJQnVmZmVyKHN0cmluZy5jaGFyYWN0ZXJzOCgpLCBsZW5ndGgpOwogICAgIH0gZWxz ZSB7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKGxlbmd0aElmMTZCaXQgPD0gc3RyaW5nLmxlbmd0 aCgpKTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQobGVuZ3RoIDw9IHN0cmluZy5sZW5ndGgoKSk7 CiAgICAgICAgIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzID0gc3RyaW5nLmNoYXJhY3RlcnMxNigp OwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aElmMTZCaXQ7ICsraSkgewor ICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CiAgICAgICAgICAg ICBVQ2hhciBjID0gY2hhcmFjdGVyc1tpXTsKICAgICAgICAgICAgIEFTU0VSVF9XSVRIX1NFQ1VS SVRZX0lNUExJQ0FUSU9OKGlzQVNDSUkoYykpOwogICAgICAgICAgICAgYXBwZW5kVG9BU0NJSUJ1 ZmZlcihjKTsKQEAgLTc4NywyOCArNzg0LDEwIEBAIHZvaWQgVVJMUGFyc2VyOjpjb3B5VVJMUGFy dHNVbnRpbChjb25zdCAKIAogICAgIG1fYXNjaWlCdWZmZXIuY2xlYXIoKTsKICAgICBtX3VuaWNv ZGVGcmFnbWVudEJ1ZmZlci5jbGVhcigpOwotICAgIGlmIChwYXJ0ID09IFVSTFBhcnQ6OkZyYWdt ZW50RW5kKSB7Ci0gICAgICAgIGNvcHlBU0NJSVN0cmluZ1VudGlsKGJhc2UubV9zdHJpbmcsIHVy bExlbmd0aFVudGlsUGFydChiYXNlLCBVUkxQYXJ0OjpGcmFnbWVudEVuZCksIHVybExlbmd0aFVu dGlsUGFydChiYXNlLCBVUkxQYXJ0OjpRdWVyeUVuZCkpOwotICAgICAgICBpZiAoIWJhc2UubV9z dHJpbmcuaXM4Qml0KCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFN0cmluZyYgZnJhZ21lbnQgPSBi YXNlLm1fc3RyaW5nOwotICAgICAgICAgICAgYm9vbCBzZWVuVW5pY29kZSA9IGZhbHNlOwotICAg ICAgICAgICAgZm9yIChzaXplX3QgaSA9IGJhc2UubV9xdWVyeUVuZDsgaSA8IGJhc2UubV9mcmFn bWVudEVuZDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFzZWVuVW5pY29kZSAmJiAhaXNB U0NJSShmcmFnbWVudFtpXSkpCi0gICAgICAgICAgICAgICAgICAgIHNlZW5Vbmljb2RlID0gdHJ1 ZTsKLSAgICAgICAgICAgICAgICBpZiAoc2VlblVuaWNvZGUpCi0gICAgICAgICAgICAgICAgICAg IG1fdW5pY29kZUZyYWdtZW50QnVmZmVyLnVuY2hlY2tlZEFwcGVuZChmcmFnbWVudFtpXSk7Ci0g ICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBtX2FzY2lpQnVmZmVyLnVu Y2hlY2tlZEFwcGVuZChmcmFnbWVudFtpXSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAg ICB9IGVsc2UgewotICAgICAgICBzaXplX3QgbGVuZ3RoID0gdXJsTGVuZ3RoVW50aWxQYXJ0KGJh c2UsIHBhcnQpOwotICAgICAgICBjb3B5QVNDSUlTdHJpbmdVbnRpbChiYXNlLm1fc3RyaW5nLCBs ZW5ndGgsIGxlbmd0aCk7Ci0gICAgfQorICAgIGNvcHlBU0NJSVN0cmluZ1VudGlsKGJhc2UubV9z dHJpbmcsIHVybExlbmd0aFVudGlsUGFydChiYXNlLCBwYXJ0KSk7CiAgICAgc3dpdGNoIChwYXJ0 KSB7CiAgICAgY2FzZSBVUkxQYXJ0OjpGcmFnbWVudEVuZDoKLSAgICAgICAgbV91cmwubV9mcmFn bWVudEVuZCA9IGJhc2UubV9mcmFnbWVudEVuZDsKLSAgICAgICAgRkFMTFRIUk9VR0g7CisgICAg ICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgY2FzZSBVUkxQYXJ0OjpRdWVy eUVuZDoKICAgICAgICAgbV91cmwubV9xdWVyeUVuZCA9IGJhc2UubV9xdWVyeUVuZDsKICAgICAg ICAgRkFMTFRIUk9VR0g7CkBAIC0xMDgyLDggKzEwNjEsMTAgQEAgVVJMUGFyc2VyOjpVUkxQYXJz ZXIoY29uc3QgU3RyaW5nJiBpbnB1dAogICAgIDogbV9pbnB1dFN0cmluZyhpbnB1dCkKIHsKICAg ICBpZiAoaW5wdXQuaXNOdWxsKCkpIHsKLSAgICAgICAgaWYgKGJhc2UuaXNWYWxpZCgpICYmICFi YXNlLm1fY2Fubm90QmVBQmFzZVVSTCkKKyAgICAgICAgaWYgKGJhc2UuaXNWYWxpZCgpICYmICFi YXNlLm1fY2Fubm90QmVBQmFzZVVSTCkgewogICAgICAgICAgICAgbV91cmwgPSBiYXNlOworICAg ICAgICAgICAgbV91cmwucmVtb3ZlRnJhZ21lbnRJZGVudGlmaWVyKCk7CisgICAgICAgIH0KICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTA5Nyw3ICsxMDc4LDggQEAgVVJMUGFyc2VyOjpV UkxQYXJzZXIoY29uc3QgU3RyaW5nJiBpbnB1dAogCiAgICAgQVNTRVJUKCFtX3VybC5tX2lzVmFs aWQKICAgICAgICAgfHwgbV9kaWRTZWVTeW50YXhWaW9sYXRpb24gPT0gKG1fdXJsLnN0cmluZygp ICE9IGlucHV0KQotICAgICAgICB8fCAoaW5wdXQuaXNFbXB0eSgpICYmIG1fdXJsLm1fc3RyaW5n ID09IGJhc2UubV9zdHJpbmcpKTsKKyAgICAgICAgfHwgKGlucHV0LmlzQWxsU3BlY2lhbENoYXJh Y3RlcnM8aXNDMENvbnRyb2xPclNwYWNlPigpCisgICAgICAgICAgICAmJiBtX3VybC5tX3N0cmlu ZyA9PSBiYXNlLm1fc3RyaW5nLnN1YnN0cmluZygwLCBiYXNlLm1fcXVlcnlFbmQpKSk7CiAgICAg QVNTRVJUKGludGVybmFsVmFsdWVzQ29uc2lzdGVudChtX3VybCkpOwogI2lmICFBU1NFUlRfRElT QUJMRUQKICAgICBpZiAoIW1fZGlkU2VlU3ludGF4VmlvbGF0aW9uKSB7CkBAIC0xNzU1LDYgKzE3 MzcsNyBAQCB2b2lkIFVSTFBhcnNlcjo6cGFyc2UoY29uc3QgQ2hhcmFjdGVyVHlwCiAgICAgICAg IExPR19GSU5BTF9TVEFURSgiU2NoZW1lU3RhcnQiKTsKICAgICAgICAgaWYgKCFjdXJyZW50UG9z aXRpb24oYykgJiYgYmFzZS5pc1ZhbGlkKCkgJiYgIWJhc2UubV9jYW5ub3RCZUFCYXNlVVJMKSB7 CiAgICAgICAgICAgICBtX3VybCA9IGJhc2U7CisgICAgICAgICAgICBtX3VybC5yZW1vdmVGcmFn bWVudElkZW50aWZpZXIoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAg ICBmYWlsdXJlKCk7CkBAIC0xNzg4LDggKzE3NzEsNyBAQCB2b2lkIFVSTFBhcnNlcjo6cGFyc2Uo Y29uc3QgQ2hhcmFjdGVyVHlwCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU3RhdGU6OlJlbGF0 aXZlOgogICAgICAgICBMT0dfRklOQUxfU1RBVEUoIlJlbGF0aXZlIik7Ci0gICAgICAgIGNvcHlV UkxQYXJ0c1VudGlsKGJhc2UsIFVSTFBhcnQ6OkZyYWdtZW50RW5kLCBjKTsKLSAgICAgICAgYnJl YWs7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgY2FzZSBTdGF0 ZTo6UmVsYXRpdmVTbGFzaDoKICAgICAgICAgTE9HX0ZJTkFMX1NUQVRFKCJSZWxhdGl2ZVNsYXNo Iik7CiAgICAgICAgIGNvcHlVUkxQYXJ0c1VudGlsKGJhc2UsIFVSTFBhcnQ6OlBvcnRFbmQsIGMp OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFyc2VyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMUGFyc2VyLmgJKHJldmlzaW9uIDIwNjczMikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBA IC05Myw3ICs5Myw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhcHBlbmRUb0FTQ0lJQnVmZmVyKGNv bnN0IGNoYXIqLCBzaXplX3QpOwogICAgIHZvaWQgYXBwZW5kVG9BU0NJSUJ1ZmZlcihjb25zdCBM Q2hhciogY2hhcmFjdGVycywgc2l6ZV90IHNpemUpIHsgYXBwZW5kVG9BU0NJSUJ1ZmZlcihyZWlu dGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihjaGFyYWN0ZXJzKSwgc2l6ZSk7IH0KICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiB2b2lkIGVuY29kZVF1ZXJ5KGNvbnN0IFZlY3Rv cjxVQ2hhcj4mIHNvdXJjZSwgY29uc3QgVGV4dEVuY29kaW5nJiwgQ29kZVBvaW50SXRlcmF0b3I8 Q2hhcmFjdGVyVHlwZT4pOwotICAgIHZvaWQgY29weUFTQ0lJU3RyaW5nVW50aWwoY29uc3QgU3Ry aW5nJiwgc2l6ZV90IGxlbmd0aElmOEJpdCwgc2l6ZV90IGxlbmd0aElmMTZCaXQpOworICAgIHZv aWQgY29weUFTQ0lJU3RyaW5nVW50aWwoY29uc3QgU3RyaW5nJiwgc2l6ZV90IGxlbmd0aCk7CiAg ICAgU3RyaW5nVmlldyBwYXJzZWREYXRhVmlldyhzaXplX3Qgc3RhcnQsIHNpemVfdCBsZW5ndGgp OwogCiAgICAgdXNpbmcgSVB2NEFkZHJlc3MgPSB1aW50MzJfdDsKSW5kZXg6IFRvb2xzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjczMikKKysr IFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEw LTAzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgVVJMUGFyc2VyOiBlbXB0eSByZWxhdGl2ZSBVUkxzIHNob3VsZCBub3QgY29weSBmcmFnbWVu dCBmcm9tIHRoZSBiYXNlIFVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTYyODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVVJMUGFyc2VyLmNwcDoK KyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6CisKIDIwMTYtMTAtMDMgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBDbGVh bnVwIHBlcnNpc3RlbnQgY3JlZGVudGlhbCBzdG9yYWdlIGNvZGUKSW5kZXg6IFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9VUkxQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDY3 MzIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVVJMUGFyc2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNDA0LDYgKzQwNCwxMSBAQCBURVNUX0YoVVJMUGFyc2VyVGVzdCwg UGFyc2VSZWxhdGl2ZSkKICAgICBjaGVja1JlbGF0aXZlVVJMKFN0cmluZygpLCAiaHR0cDovL3dl YmtpdC5vcmcvIiwgeyJodHRwIiwgIiIsICIiLCAid2Via2l0Lm9yZyIsIDAsICIvIiwgIiIsICIi LCAiaHR0cDovL3dlYmtpdC5vcmcvIn0pOwogICAgIGNoZWNrUmVsYXRpdmVVUkwoImh0dHBzOi8v QHRlc3RAdGVzdEBleGFtcGxlOjgwMFxccGF0aEBlbmQiLCAiaHR0cDovL2RvZXNub3RtYXR0ZXIv IiwgeyIiLCAiIiwgIiIsICIiLCAwLCAiIiwgIiIsICIiLCAiaHR0cHM6Ly9AdGVzdEB0ZXN0QGV4 YW1wbGU6ODAwXFxwYXRoQGVuZCJ9KTsKICAgICBjaGVja1JlbGF0aXZlVVJMKCJodHRwOi8vZjow L2MiLCAiaHR0cDovL2V4YW1wbGUub3JnL2Zvby9iYXIiLCB7Imh0dHAiLCAiIiwgIiIsICJmIiwg MCwgIi9jIiwgIiIsICIiLCAiaHR0cDovL2Y6MC9jIn0pOworICAgIGNoZWNrUmVsYXRpdmVVUkwo U3RyaW5nKCksICJodHRwOi8vaG9zdC8jZnJhZ21lbnQiLCB7Imh0dHAiLCAiIiwgIiIsICJob3N0 IiwgMCwgIi8iLCAiIiwgIiIsICJodHRwOi8vaG9zdC8ifSk7CisgICAgY2hlY2tSZWxhdGl2ZVVS TCgiIiwgImh0dHA6Ly9ob3N0LyNmcmFnbWVudCIsIHsiaHR0cCIsICIiLCAiIiwgImhvc3QiLCAw LCAiLyIsICIiLCAiIiwgImh0dHA6Ly9ob3N0LyJ9KTsKKyAgICBjaGVja1JlbGF0aXZlVVJMKCIg ICIsICJodHRwOi8vaG9zdC8jZnJhZ21lbnQiLCB7Imh0dHAiLCAiIiwgIiIsICJob3N0IiwgMCwg Ii8iLCAiIiwgIiIsICJodHRwOi8vaG9zdC8ifSk7CisgICAgY2hlY2tSZWxhdGl2ZVVSTCgiICAi LCAiaHR0cDovL2hvc3QvcGF0aD9xdWVyeSNmcmEjZ21lbnQiLCB7Imh0dHAiLCAiIiwgIiIsICJo b3N0IiwgMCwgIi9wYXRoIiwgInF1ZXJ5IiwgIiIsICJodHRwOi8vaG9zdC9wYXRoP3F1ZXJ5In0p OworICAgIGNoZWNrUmVsYXRpdmVVUkwoIiBcYSAiLCAiaHR0cDovL2hvc3QvI2ZyYWdtZW50Iiwg eyJodHRwIiwgIiIsICIiLCAiaG9zdCIsIDAsICIvIiwgIiIsICIiLCAiaHR0cDovL2hvc3QvIn0p OwogCiAgICAgLy8gVGhlIGNoZWNraW5nIG9mIHNsYXNoZXMgaW4gU3BlY2lhbEF1dGhvcml0eVNs YXNoZXMgbmVlZGVkIHRvIGdldCB0aGlzIHRvIHBhc3MgY29udHJhZGljdHMgd2hhdCBpcyBpbiB0 aGUgc3BlYywKICAgICAvLyBidXQgaXQgaXMgaW5jbHVkZWQgaW4gdGhlIHdlYiBwbGF0Zm9ybSB0 ZXN0cy4K