99889 2012-10-19 16:44:21 -0700 HTML Parser should produce 8 bit strings for doctype, comment and tagName tokens 2012-10-22 17:46:13 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff oldest_to_newest 746763 0 msaboff 2012-10-19 16:44:21 -0700 This is to fill out the tokens that the HTML parser will create 8-bit AtomicStrings for to include doctype, comments and tagName's. 746779 1 169729 msaboff 2012-10-19 16:57:01 -0700 Created attachment 169729 Patch 748022 2 169729 ggaren 2012-10-22 16:02:17 -0700 Comment on attachment 169729 Patch r=me 748124 3 msaboff 2012-10-22 17:40:09 -0700 Committed r132165: <http://trac.webkit.org/changeset/132165> 748132 4 169729 darin 2012-10-22 17:46:13 -0700 Comment on attachment 169729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169729&action=review > Source/WebCore/xml/parser/MarkupTokenBase.h:148 > + void beginEndTag(Vector<LChar, 32> characters) This argument type should be const Vector&, unless we want to copy a vector each time for some reason! > Source/WebCore/xml/parser/MarkupTokenBase.h:396 > + inline const String nameString() const The const in this return type “const String” doesn’t add value and should be removed. The inline keyword also adds nothing. Not sure why surrounding functions are using it. 169729 2012-10-19 16:57:01 -0700 2012-10-22 17:46:13 -0700 Patch 99889.patch text/plain 15257 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTk2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTEwLTE5ICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIEhUTUwgUGFyc2VyIHNob3Vs ZCBwcm9kdWNlIDggYml0IHN0cmluZ3MgZm9yIGRvY3R5cGUsIGNvbW1lbnQgYW5kIHRhZ05hbWUg dG9rZW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 OTg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIDggYml0IGNoZWNrIGZvciBhY2N1bXVsYXRpbmcgYWxsIHRva2VuIGRhdGEgaW4gTWFya3Vw VG9rZW5CYXNlLiAgQWRkZWQgY29kZSB0byBjb252ZXJ0CisgICAgICAgICJuYW1lIiB0b2tlbiBk YXRhIGRpcmVjdGx5IHRvIGEgc3RyaW5nICg4IG9yIDE2IGFzIGFwcHJvcHJpYXRlKS4gIENoYW5n ZWQgdG8gYWNjdW11bGF0ZQorICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZSBhcyBMQ2hhcidz LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUb2tlbi5oOgorICAgICAgICAoSFRNTFRva2VuKToK KyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9r ZW5pemVyOjphZGRUb1Bvc3NpYmxlRW5kVGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tl bml6ZXI6OmlzQXBwcm9wcmlhdGVFbmRUYWcpOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxU b2tlbml6ZXIuaDoKKyAgICAgICAgKEhUTUxUb2tlbml6ZXIpOgorICAgICAgICAqIGh0bWwvcGFy c2VyL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxk ZXI6OkV4dGVybmFsQ2hhcmFjdGVyVG9rZW5CdWZmZXI6OnRha2VMZWFkaW5nKToKKyAgICAgICAg KiB4bWwvcGFyc2VyL01hcmt1cFRva2VuQmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6TWFya3Vw VG9rZW5CYXNlOjpiZWdpblN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6Ok1hcmt1cFRva2Vu QmFzZTo6YmVnaW5FbmRUYWcpOgorICAgICAgICAoTWFya3VwVG9rZW5CYXNlKToKKyAgICAgICAg KFdlYkNvcmU6Ok1hcmt1cFRva2VuQmFzZTo6YmVnaW5ET0NUWVBFKToKKyAgICAgICAgKFdlYkNv cmU6Ok1hcmt1cFRva2VuQmFzZTo6YXBwZW5kVG9Db21tZW50KToKKyAgICAgICAgKFdlYkNvcmU6 Ok1hcmt1cFRva2VuQmFzZTo6YXBwZW5kVG9OYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Ok1hcmt1 cFRva2VuQmFzZTo6bmFtZVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpBdG9taWNNYXJrdXBU b2tlbkJhc2U6OkF0b21pY01hcmt1cFRva2VuQmFzZSk6CisKIDIwMTItMTAtMTkgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogYXJpYS1oaWRkZW49 ZmFsc2UgZG9lcyBub3Qgd29yayBhcyBleHBlY3RlZApJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTFRva2VuLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFRva2VuLmgJKHJldmlzaW9uIDEzMTgzNikKKysrIFNvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxUb2tlbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIHB1 YmxpYzoKICAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBIVE1MVG9rZW5UeXBlczo6U3RhcnRUYWcg fHwgbV90eXBlID09IEhUTUxUb2tlblR5cGVzOjpFbmRUYWcgfHwgbV90eXBlID09IEhUTUxUb2tl blR5cGVzOjpET0NUWVBFKTsKICAgICAgICAgTWFya3VwVG9rZW5CYXNlPEhUTUxUb2tlblR5cGVz LCBIVE1MVG9rZW5UeXBlczo6RG9jdHlwZURhdGE+OjphcHBlbmRUb05hbWUoY2hhcmFjdGVyKTsK ICAgICB9Ci0gICAgCisKICAgICBjb25zdCBEYXRhVmVjdG9yJiBuYW1lKCkgY29uc3QKICAgICB7 CiAgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gSFRNTFRva2VuVHlwZXM6OlN0YXJ0VGFnIHx8IG1f dHlwZSA9PSBIVE1MVG9rZW5UeXBlczo6RW5kVGFnIHx8IG1fdHlwZSA9PSBIVE1MVG9rZW5UeXBl czo6RE9DVFlQRSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9rZW5p emVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9r ZW5pemVyLmNwcAkocmV2aXNpb24gMTMxODM2KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFRva2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNiwxMCArMzE2LDEwIEBA IGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKIAogICAgIEhUTUxfQkVH SU5fU1RBVEUoRW5kVGFnT3BlblN0YXRlKSB7CiAgICAgICAgIGlmIChpc0FTQ0lJVXBwZXIoY2Mp KSB7Ci0gICAgICAgICAgICBtX3Rva2VuLT5iZWdpbkVuZFRhZyh0b0xvd2VyQ2FzZShjYykpOwor ICAgICAgICAgICAgbV90b2tlbi0+YmVnaW5FbmRUYWcoc3RhdGljX2Nhc3Q8TENoYXI+KHRvTG93 ZXJDYXNlKGNjKSkpOwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFRhZ05hbWVTdGF0ZSk7 CiAgICAgICAgIH0gZWxzZSBpZiAoaXNBU0NJSUxvd2VyKGNjKSkgewotICAgICAgICAgICAgbV90 b2tlbi0+YmVnaW5FbmRUYWcoY2MpOworICAgICAgICAgICAgbV90b2tlbi0+YmVnaW5FbmRUYWco c3RhdGljX2Nhc3Q8TENoYXI+KGNjKSk7CiAgICAgICAgICAgICBIVE1MX0FEVkFOQ0VfVE8oVGFn TmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsKICAgICAgICAgICAg IHBhcnNlRXJyb3IoKTsKQEAgLTM3MywxMSArMzczLDExIEBAIGJvb2wgSFRNTFRva2VuaXplcjo6 bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICBIVE1MX0JFR0lOX1NUQVRFKFJDREFUQUVuZFRhZ09w ZW5TdGF0ZSkgewogICAgICAgICBpZiAoaXNBU0NJSVVwcGVyKGNjKSkgewogICAgICAgICAgICAg bV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PExDaGFyPihjYykpOwotICAgICAg ICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyh0b0xvd2VyQ2FzZShjYykpOworICAgICAgICAgICAg YWRkVG9Qb3NzaWJsZUVuZFRhZyhzdGF0aWNfY2FzdDxMQ2hhcj4odG9Mb3dlckNhc2UoY2MpKSk7 CiAgICAgICAgICAgICBIVE1MX0FEVkFOQ0VfVE8oUkNEQVRBRW5kVGFnTmFtZVN0YXRlKTsKICAg ICAgICAgfSBlbHNlIGlmIChpc0FTQ0lJTG93ZXIoY2MpKSB7CiAgICAgICAgICAgICBtX3RlbXBv cmFyeUJ1ZmZlci5hcHBlbmQoc3RhdGljX2Nhc3Q8TENoYXI+KGNjKSk7Ci0gICAgICAgICAgICBh ZGRUb1Bvc3NpYmxlRW5kVGFnKGNjKTsKKyAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWco c3RhdGljX2Nhc3Q8TENoYXI+KGNjKSk7CiAgICAgICAgICAgICBIVE1MX0FEVkFOQ0VfVE8oUkNE QVRBRW5kVGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGJ1ZmZl ckNoYXJhY3RlcignPCcpOwpAQCAtMzkwLDExICszOTAsMTEgQEAgYm9vbCBIVE1MVG9rZW5pemVy OjpuZXh0VG9rZW4oU2VnbWVudGVkUwogICAgIEhUTUxfQkVHSU5fU1RBVEUoUkNEQVRBRW5kVGFn TmFtZVN0YXRlKSB7CiAgICAgICAgIGlmIChpc0FTQ0lJVXBwZXIoY2MpKSB7CiAgICAgICAgICAg ICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoc3RhdGljX2Nhc3Q8TENoYXI+KGNjKSk7Ci0gICAg ICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHRvTG93ZXJDYXNlKGNjKSk7CisgICAgICAgICAg ICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHN0YXRpY19jYXN0PExDaGFyPih0b0xvd2VyQ2FzZShjYykp KTsKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhSQ0RBVEFFbmRUYWdOYW1lU3RhdGUpOwog ICAgICAgICB9IGVsc2UgaWYgKGlzQVNDSUlMb3dlcihjYykpIHsKICAgICAgICAgICAgIG1fdGVt cG9yYXJ5QnVmZmVyLmFwcGVuZChzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsKLSAgICAgICAgICAg IGFkZFRvUG9zc2libGVFbmRUYWcoY2MpOworICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRh ZyhzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhS Q0RBVEFFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYg KGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKQEAgLTQzOCwxMSArNDM4LDExIEBAIGJvb2wg SFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICBIVE1MX0JFR0lOX1NUQVRF KFJBV1RFWFRFbmRUYWdPcGVuU3RhdGUpIHsKICAgICAgICAgaWYgKGlzQVNDSUlVcHBlcihjYykp IHsKICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChzdGF0aWNfY2FzdDxMQ2hh cj4oY2MpKTsKLSAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcodG9Mb3dlckNhc2UoY2Mp KTsKKyAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcoc3RhdGljX2Nhc3Q8TENoYXI+KHRv TG93ZXJDYXNlKGNjKSkpOwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFJBV1RFWFRFbmRU YWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2UgaWYgKGlzQVNDSUlMb3dlcihjYykpIHsKICAg ICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChzdGF0aWNfY2FzdDxMQ2hhcj4oY2Mp KTsKLSAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcoY2MpOworICAgICAgICAgICAgYWRk VG9Qb3NzaWJsZUVuZFRhZyhzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsKICAgICAgICAgICAgIEhU TUxfQURWQU5DRV9UTyhSQVdURVhURW5kVGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3RlcignPCcpOwpAQCAtNDU1LDExICs0NTUsMTEgQEAg Ym9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkUwogICAgIEhUTUxfQkVHSU5f U1RBVEUoUkFXVEVYVEVuZFRhZ05hbWVTdGF0ZSkgewogICAgICAgICBpZiAoaXNBU0NJSVVwcGVy KGNjKSkgewogICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0 PExDaGFyPihjYykpOwotICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyh0b0xvd2VyQ2Fz ZShjYykpOworICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyhzdGF0aWNfY2FzdDxMQ2hh cj4odG9Mb3dlckNhc2UoY2MpKSk7CiAgICAgICAgICAgICBIVE1MX0FEVkFOQ0VfVE8oUkFXVEVY VEVuZFRhZ05hbWVTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSBpZiAoaXNBU0NJSUxvd2VyKGNjKSkg ewogICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PExDaGFy PihjYykpOwotICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyhjYyk7CisgICAgICAgICAg ICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHN0YXRpY19jYXN0PExDaGFyPihjYykpOwogICAgICAgICAg ICAgSFRNTF9BRFZBTkNFX1RPKFJBV1RFWFRFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKQEAgLTUw NywxMSArNTA3LDExIEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMK ICAgICBIVE1MX0JFR0lOX1NUQVRFKFNjcmlwdERhdGFFbmRUYWdPcGVuU3RhdGUpIHsKICAgICAg ICAgaWYgKGlzQVNDSUlVcHBlcihjYykpIHsKICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVy LmFwcGVuZChzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsKLSAgICAgICAgICAgIGFkZFRvUG9zc2li bGVFbmRUYWcodG9Mb3dlckNhc2UoY2MpKTsKKyAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRU YWcoc3RhdGljX2Nhc3Q8TENoYXI+KHRvTG93ZXJDYXNlKGNjKSkpOwogICAgICAgICAgICAgSFRN TF9BRFZBTkNFX1RPKFNjcmlwdERhdGFFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2Ug aWYgKGlzQVNDSUlMb3dlcihjYykpIHsKICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFw cGVuZChzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsKLSAgICAgICAgICAgIGFkZFRvUG9zc2libGVF bmRUYWcoY2MpOworICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyhzdGF0aWNfY2FzdDxM Q2hhcj4oY2MpKTsKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9UTyhTY3JpcHREYXRhRW5kVGFn TmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGJ1ZmZlckNoYXJhY3Rl cignPCcpOwpAQCAtNTI0LDExICs1MjQsMTEgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9r ZW4oU2VnbWVudGVkUwogICAgIEhUTUxfQkVHSU5fU1RBVEUoU2NyaXB0RGF0YUVuZFRhZ05hbWVT dGF0ZSkgewogICAgICAgICBpZiAoaXNBU0NJSVVwcGVyKGNjKSkgewogICAgICAgICAgICAgbV90 ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PExDaGFyPihjYykpOwotICAgICAgICAg ICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyh0b0xvd2VyQ2FzZShjYykpOworICAgICAgICAgICAgYWRk VG9Qb3NzaWJsZUVuZFRhZyhzdGF0aWNfY2FzdDxMQ2hhcj4odG9Mb3dlckNhc2UoY2MpKSk7CiAg ICAgICAgICAgICBIVE1MX0FEVkFOQ0VfVE8oU2NyaXB0RGF0YUVuZFRhZ05hbWVTdGF0ZSk7CiAg ICAgICAgIH0gZWxzZSBpZiAoaXNBU0NJSUxvd2VyKGNjKSkgewogICAgICAgICAgICAgbV90ZW1w b3JhcnlCdWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PExDaGFyPihjYykpOwotICAgICAgICAgICAg YWRkVG9Qb3NzaWJsZUVuZFRhZyhjYyk7CisgICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFn KHN0YXRpY19jYXN0PExDaGFyPihjYykpOwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFNj cmlwdERhdGFFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg aWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKQEAgLTY1MywxMSArNjUzLDExIEBAIGJv b2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFMKICAgICBIVE1MX0JFR0lOX1NU QVRFKFNjcmlwdERhdGFFc2NhcGVkRW5kVGFnT3BlblN0YXRlKSB7CiAgICAgICAgIGlmIChpc0FT Q0lJVXBwZXIoY2MpKSB7CiAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoc3Rh dGljX2Nhc3Q8TENoYXI+KGNjKSk7Ci0gICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHRv TG93ZXJDYXNlKGNjKSk7CisgICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHN0YXRpY19j YXN0PExDaGFyPih0b0xvd2VyQ2FzZShjYykpKTsKICAgICAgICAgICAgIEhUTUxfQURWQU5DRV9U TyhTY3JpcHREYXRhRXNjYXBlZEVuZFRhZ05hbWVTdGF0ZSk7CiAgICAgICAgIH0gZWxzZSBpZiAo aXNBU0NJSUxvd2VyKGNjKSkgewogICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5k KHN0YXRpY19jYXN0PExDaGFyPihjYykpOwotICAgICAgICAgICAgYWRkVG9Qb3NzaWJsZUVuZFRh ZyhjYyk7CisgICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKHN0YXRpY19jYXN0PExDaGFy PihjYykpOwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFNjcmlwdERhdGFFc2NhcGVkRW5k VGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGJ1ZmZlckNoYXJh Y3RlcignPCcpOwpAQCAtNjcwLDExICs2NzAsMTEgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0 VG9rZW4oU2VnbWVudGVkUwogICAgIEhUTUxfQkVHSU5fU1RBVEUoU2NyaXB0RGF0YUVzY2FwZWRF bmRUYWdOYW1lU3RhdGUpIHsKICAgICAgICAgaWYgKGlzQVNDSUlVcHBlcihjYykpIHsKICAgICAg ICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChzdGF0aWNfY2FzdDxMQ2hhcj4oY2MpKTsK LSAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcodG9Mb3dlckNhc2UoY2MpKTsKKyAgICAg ICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcoc3RhdGljX2Nhc3Q8TENoYXI+KHRvTG93ZXJDYXNl KGNjKSkpOwogICAgICAgICAgICAgSFRNTF9BRFZBTkNFX1RPKFNjcmlwdERhdGFFc2NhcGVkRW5k VGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIGlmIChpc0FTQ0lJTG93ZXIoY2MpKSB7CiAg ICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5hcHBlbmQoc3RhdGljX2Nhc3Q8TENoYXI+KGNj KSk7Ci0gICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKGNjKTsKKyAgICAgICAgICAgIGFk ZFRvUG9zc2libGVFbmRUYWcoc3RhdGljX2Nhc3Q8TENoYXI+KGNjKSk7CiAgICAgICAgICAgICBI VE1MX0FEVkFOQ0VfVE8oU2NyaXB0RGF0YUVzY2FwZWRFbmRUYWdOYW1lU3RhdGUpOwogICAgICAg ICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsK QEAgLTE2MTEsNyArMTYxMSw3IEBAIGlubGluZSBib29sIEhUTUxUb2tlbml6ZXI6OnRlbXBvcmFy eUJ1ZmYKICAgICByZXR1cm4gdmVjdG9yRXF1YWxzU3RyaW5nKG1fdGVtcG9yYXJ5QnVmZmVyLCBl eHBlY3RlZFN0cmluZyk7CiB9CiAKLWlubGluZSB2b2lkIEhUTUxUb2tlbml6ZXI6OmFkZFRvUG9z c2libGVFbmRUYWcoVUNoYXIgY2MpCitpbmxpbmUgdm9pZCBIVE1MVG9rZW5pemVyOjphZGRUb1Bv c3NpYmxlRW5kVGFnKExDaGFyIGNjKQogewogICAgIEFTU0VSVChpc0VuZFRhZ0J1ZmZlcmluZ1N0 YXRlKG1fc3RhdGUpKTsKICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5hcHBlbmQoY2MpOwpAQCAt MTYxOSw3ICsxNjE5LDE3IEBAIGlubGluZSB2b2lkIEhUTUxUb2tlbml6ZXI6OmFkZFRvUG9zc2li bGUKIAogaW5saW5lIGJvb2wgSFRNTFRva2VuaXplcjo6aXNBcHByb3ByaWF0ZUVuZFRhZygpCiB7 Ci0gICAgcmV0dXJuIG1fYnVmZmVyZWRFbmRUYWdOYW1lID09IG1fYXBwcm9wcmlhdGVFbmRUYWdO YW1lOworICAgIGlmIChtX2J1ZmZlcmVkRW5kVGFnTmFtZS5zaXplKCkgIT0gbV9hcHByb3ByaWF0 ZUVuZFRhZ05hbWUuc2l6ZSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBzaXplX3Qg bnVtQ2hhcmFjdGVycyA9IG1fYnVmZmVyZWRFbmRUYWdOYW1lLnNpemUoKTsKKworICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbnVtQ2hhcmFjdGVyczsgaSsrKSB7CisgICAgICAgIGlmIChtX2J1 ZmZlcmVkRW5kVGFnTmFtZVtpXSAhPSBtX2FwcHJvcHJpYXRlRW5kVGFnTmFtZVtpXSkKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogaW5s aW5lIHZvaWQgSFRNTFRva2VuaXplcjo6cGFyc2VFcnJvcigpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuaXplci5oCShyZXZpc2lvbiAxMzE4MzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVG9rZW5pemVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTE5NCw3ICsxOTQsNyBAQCBwcml2YXRlOgogICAgIC8vIFNvbWV0aW1lcyB3ZSBzcGVjdWxhdGl2 ZWx5IGNvbnN1bWUgaW5wdXQgY2hhcmFjdGVycyBhbmQgd2UgZG9uJ3QKICAgICAvLyBrbm93IHdo ZXRoZXIgdGhleSByZXByZXNlbnQgZW5kIHRhZ3Mgb3IgUkNEQVRBLCBldGMuIFRoZXNlCiAgICAg Ly8gZnVuY3Rpb25zIGhlbHAgbWFuYWdlIHRoZXNlIHN0YXRlLgotICAgIGlubGluZSB2b2lkIGFk ZFRvUG9zc2libGVFbmRUYWcoVUNoYXIgY2MpOworICAgIGlubGluZSB2b2lkIGFkZFRvUG9zc2li bGVFbmRUYWcoTENoYXIgY2MpOwogCiAgICAgaW5saW5lIHZvaWQgc2F2ZUVuZFRhZ05hbWVJZk5l ZWRlZCgpCiAgICAgewpAQCAtMjE0LDcgKzIxNCw3IEBAIHByaXZhdGU6CiAgICAgLy8gV2Ugb2Nj YXRpb25hbGx5IHdhbnQgdG8gZW1pdCBib3RoIGEgY2hhcmFjdGVyIHRva2VuIGFuZCBhbiBlbmQg dGFnCiAgICAgLy8gdG9rZW4gKGUuZy4sIHdoZW4gbGV4aW5nIHNjcmlwdCkuIFdlIGJ1ZmZlciB0 aGUgbmFtZSBvZiB0aGUgZW5kIHRhZwogICAgIC8vIHRva2VuIGhlcmUgc28gd2UgcmVtZW1iZXIg aXQgbmV4dCB0aW1lIHdlIHJlLWVudGVyIHRoZSB0b2tlbml6ZXIuCi0gICAgVmVjdG9yPFVDaGFy LCAzMj4gbV9idWZmZXJlZEVuZFRhZ05hbWU7CisgICAgVmVjdG9yPExDaGFyLCAzMj4gbV9idWZm ZXJlZEVuZFRhZ05hbWU7CiAKICAgICBib29sIG1fdXNlUHJlSFRNTDVQYXJzZXJRdWlya3M7CiB9 OwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIu Y3BwCShyZXZpc2lvbiAxMzE4MzYpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M VHJlZUJ1aWxkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsNiArMjU2LDggQEAgcHJpdmF0 ZToKICAgICAgICAgc2tpcExlYWRpbmc8Y2hhcmFjdGVyUHJlZGljYXRlPigpOwogICAgICAgICBp ZiAoc3RhcnQgPT0gbV9jdXJyZW50KQogICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAg ICAgICBpZiAoaXNBbGw4Qml0RGF0YSgpKQorICAgICAgICAgICAgcmV0dXJuIFN0cmluZzo6bWFr ZThCaXRGcm9tMTZCaXRTb3VyY2Uoc3RhcnQsIG1fY3VycmVudCAtIHN0YXJ0KTsKICAgICAgICAg cmV0dXJuIFN0cmluZyhzdGFydCwgbV9jdXJyZW50IC0gc3RhcnQpOwogICAgIH0KIApJbmRleDog U291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9NYXJrdXBUb2tlbkJhc2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL01hcmt1cFRva2VuQmFzZS5oCShyZXZpc2lvbiAx MzE4MzYpCisrKyBTb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL01hcmt1cFRva2VuQmFzZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC05OCw3ICs5OCw2IEBAIHB1YmxpYzoKICAgICAgICAgbV9iYXNlT2Zm c2V0ID0gMDsKICAgICAgICAgbV9kYXRhLmNsZWFyKCk7CiAgICAgICAgIG1fb3JBbGxEYXRhID0g MDsKLSAgICAgICAgbV9jb252ZXJ0VG84Qml0SWZQb3NzaWJsZSA9IGZhbHNlOwogICAgIH0KIAog ICAgIGJvb2wgaXNVbmluaXRpYWxpemVkKCkgeyByZXR1cm4gbV90eXBlID09IFR5cGVTZXQ6OlVu aW5pdGlhbGl6ZWQ7IH0KQEAgLTEzMiwxMCArMTMxLDEwIEBAIHB1YmxpYzoKICAgICAgICAgbV9h dHRyaWJ1dGVzLmNsZWFyKCk7CiAKICAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIpOwor ICAgICAgICBtX29yQWxsRGF0YSB8PSBjaGFyYWN0ZXI7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8 dHlwZW5hbWUgVD4KLSAgICB2b2lkIGJlZ2luRW5kVGFnKFQgY2hhcmFjdGVycykKKyAgICB2b2lk IGJlZ2luRW5kVGFnKExDaGFyIGNoYXJhY3RlcikKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3R5 cGUgPT0gVHlwZVNldDo6VW5pbml0aWFsaXplZCk7CiAgICAgICAgIG1fdHlwZSA9IFR5cGVTZXQ6 OkVuZFRhZzsKQEAgLTE0Myw3ICsxNDIsMTggQEAgcHVibGljOgogICAgICAgICBtX2N1cnJlbnRB dHRyaWJ1dGUgPSAwOwogICAgICAgICBtX2F0dHJpYnV0ZXMuY2xlYXIoKTsKIAotICAgICAgICBt X2RhdGEuYXBwZW5kKGNoYXJhY3RlcnMpOworICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rl cik7CisgICAgfQorCisgICAgdm9pZCBiZWdpbkVuZFRhZyhWZWN0b3I8TENoYXIsIDMyPiBjaGFy YWN0ZXJzKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBUeXBlU2V0OjpVbmluaXRp YWxpemVkKTsKKyAgICAgICAgbV90eXBlID0gVHlwZVNldDo6RW5kVGFnOworICAgICAgICBtX3Nl bGZDbG9zaW5nID0gZmFsc2U7CisgICAgICAgIG1fY3VycmVudEF0dHJpYnV0ZSA9IDA7CisgICAg ICAgIG1fYXR0cmlidXRlcy5jbGVhcigpOworCisgICAgICAgIG1fZGF0YS5hcHBlbmRWZWN0b3Io Y2hhcmFjdGVycyk7CiAgICAgfQogCiAgICAgLy8gU3RhcnRpbmcgYSBjaGFyYWN0ZXIgdG9rZW4g d29ya3Mgc2xpZ2h0bHkgZGlmZmVyZW50bHkgdGhhbiBzdGFydGluZwpAQCAtMTcyLDYgKzE4Miw3 IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKGNoYXJhY3Rlcik7CiAgICAgICAgIGJlZ2luRE9D VFlQRSgpOwogICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7CisgICAgICAgIG1fb3JB bGxEYXRhIHw9IGNoYXJhY3RlcjsKICAgICB9CiAKICAgICB2b2lkIGFwcGVuZFRvQ2hhcmFjdGVy KGNoYXIgY2hhcmFjdGVyKQpAQCAtMTk4LDYgKzIwOSw3IEBAIHB1YmxpYzoKICAgICAgICAgQVNT RVJUKGNoYXJhY3Rlcik7CiAgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVHlwZVNldDo6Q29tbWVu dCk7CiAgICAgICAgIG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKKyAgICAgICAgbV9vckFsbERh dGEgfD0gY2hhcmFjdGVyOwogICAgIH0KIAogICAgIHZvaWQgYWRkTmV3QXR0cmlidXRlKCkKQEAg LTM3MywxMyArMzg1LDIzIEBAIHByb3RlY3RlZDoKICAgICB7CiAgICAgICAgIEFTU0VSVChjaGFy YWN0ZXIpOwogICAgICAgICBtX2RhdGEuYXBwZW5kKGNoYXJhY3Rlcik7CisgICAgICAgIG1fb3JB bGxEYXRhIHw9IGNoYXJhY3RlcjsKICAgICB9Ci0gICAgCisKICAgICBpbmxpbmUgY29uc3QgRGF0 YVZlY3RvciYgbmFtZSgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9kYXRhOwogICAg IH0KIAorICAgIGlubGluZSBjb25zdCBTdHJpbmcgbmFtZVN0cmluZygpIGNvbnN0CisgICAgewor ICAgICAgICBpZiAoIW1fZGF0YS5zaXplKCkpCisgICAgICAgICAgICByZXR1cm4gZW1wdHlTdHJp bmcoKTsKKyAgICAgICAgaWYgKGlzQWxsOEJpdERhdGEoKSkKKyAgICAgICAgICAgIHJldHVybiBT dHJpbmc6Om1ha2U4Qml0RnJvbTE2Qml0U291cmNlKG1fZGF0YS5kYXRhKCksIG1fZGF0YS5zaXpl KCkpOworICAgICAgICByZXR1cm4gU3RyaW5nKG1fZGF0YS5kYXRhKCksIG1fZGF0YS5zaXplKCkp OworICAgIH0KKwogICAgIC8vIEZJWE1FOiBJJ20gbm90IHN1cmUgd2hhdCB0aGUgZmluYWwgcmVs YXRpb25zaGlwIGJldHdlZW4gTWFya3VwVG9rZW5CYXNlIGFuZAogICAgIC8vIEF0b21pY01hcmt1 cFRva2VuQmFzZSB3aWxsIGJlLiBJJ20gbWFya2luZyB0aGlzIGEgZnJpZW5kIGZvciBub3csIGJ1 dCB3ZSdsbAogICAgIC8vIHdhbnQgdG8gZW5kIHVwIHdpdGggYSBjbGVhbmVyIGludGVyZmFjZSBi ZXR3ZWVuIHRoZSB0d28gY2xhc3Nlcy4KQEAgLTM5MSw3ICs0MTMsNiBAQCBwcm90ZWN0ZWQ6CiAg ICAgaW50IG1fYmFzZU9mZnNldDsKICAgICBEYXRhVmVjdG9yIG1fZGF0YTsKICAgICBVQ2hhciBt X29yQWxsRGF0YTsKLSAgICBib29sIG1fY29udmVydFRvOEJpdElmUG9zc2libGU7CiAKICAgICAv LyBGb3IgRE9DVFlQRQogICAgIE93blB0cjxEb2N0eXBlRGF0YT4gbV9kb2N0eXBlRGF0YTsKQEAg LTQxOCw3ICs0MzksNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFRva2VuOjpUeXBlOjpET0NUWVBF OgotICAgICAgICAgICAgbV9uYW1lID0gQXRvbWljU3RyaW5nKHRva2VuLT5uYW1lKCkuZGF0YSgp LCB0b2tlbi0+bmFtZSgpLnNpemUoKSk7CisgICAgICAgICAgICBtX25hbWUgPSBBdG9taWNTdHJp bmcodG9rZW4tPm5hbWVTdHJpbmcoKSk7CiAgICAgICAgICAgICBtX2RvY3R5cGVEYXRhID0gdG9r ZW4tPm1fZG9jdHlwZURhdGEucmVsZWFzZSgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IGNhc2UgVG9rZW46OlR5cGU6OkVuZE9mRmlsZToKQEAgLTQyNiwxMiArNDQ3LDE1IEBAIHB1Ymxp YzoKICAgICAgICAgY2FzZSBUb2tlbjo6VHlwZTo6U3RhcnRUYWc6CiAgICAgICAgIGNhc2UgVG9r ZW46OlR5cGU6OkVuZFRhZzogewogICAgICAgICAgICAgbV9zZWxmQ2xvc2luZyA9IHRva2VuLT5z ZWxmQ2xvc2luZygpOwotICAgICAgICAgICAgbV9uYW1lID0gQXRvbWljU3RyaW5nKHRva2VuLT5u YW1lKCkuZGF0YSgpLCB0b2tlbi0+bmFtZSgpLnNpemUoKSk7CisgICAgICAgICAgICBtX25hbWUg PSBBdG9taWNTdHJpbmcodG9rZW4tPm5hbWVTdHJpbmcoKSk7CiAgICAgICAgICAgICBpbml0aWFs aXplQXR0cmlidXRlcyh0b2tlbi0+YXR0cmlidXRlcygpKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICB9CiAgICAgICAgIGNhc2UgVG9rZW46OlR5cGU6OkNvbW1lbnQ6Ci0gICAgICAgICAg ICBtX2RhdGEgPSBTdHJpbmcodG9rZW4tPmNvbW1lbnQoKS5kYXRhKCksIHRva2VuLT5jb21tZW50 KCkuc2l6ZSgpKTsKKyAgICAgICAgICAgIGlmICh0b2tlbi0+aXNBbGw4Qml0RGF0YSgpKQorICAg ICAgICAgICAgICAgIG1fZGF0YSA9IFN0cmluZzo6bWFrZThCaXRGcm9tMTZCaXRTb3VyY2UodG9r ZW4tPmNvbW1lbnQoKS5kYXRhKCksIHRva2VuLT5jb21tZW50KCkuc2l6ZSgpKTsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICBtX2RhdGEgPSBTdHJpbmcodG9rZW4tPmNvbW1lbnQo KS5kYXRhKCksIHRva2VuLT5jb21tZW50KCkuc2l6ZSgpKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFRva2VuOjpUeXBlOjpDaGFyYWN0ZXI6CiAgICAgICAgICAgICBtX2V4dGVy bmFsQ2hhcmFjdGVycyA9ICZ0b2tlbi0+Y2hhcmFjdGVycygpOwo=