39263 2010-05-17 20:37:57 -0700 Remove load-related code from HTML5Tokenizer 2010-05-17 20:41:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 abarth webkit-unassigned eric oldest_to_newest 227088 0 abarth 2010-05-17 20:37:57 -0700 Remove load-related code from HTML5Tokenizer 227089 1 56316 abarth 2010-05-17 20:39:19 -0700 Created attachment 56316 Patch 227090 2 56316 eric 2010-05-17 20:40:33 -0700 Comment on attachment 56316 Patch LGTM. 227091 3 abarth 2010-05-17 20:41:46 -0700 Committed r59644: <http://trac.webkit.org/changeset/59644> 56316 2010-05-17 20:39:19 -0700 2010-05-17 20:40:32 -0700 Patch bug-39263-20100517203918.patch text/plain 14285 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTc0YTE0YTlmMzgzNjExMjk3ZjMxMWMzZDcxMjY2YmVhZGU1ZGUyYy4uNWQzZDNlMWFmYzgwMDg2 YWU4NzljYzIyN2I1YjE4N2Q1Mjc1NmFkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMC0wNS0xNyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBsb2FkLXJlbGF0ZWQgY29kZSBmcm9tIEhUTUw1 VG9rZW5pemVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTI2MworCisgICAgICAgIFRoaXMgY29kZSBpcyByZWxhdGVkIHRvIHJlbG9hZGluZyByZXNv dXJjZXMgYW5kIG5vdCB0byB0b2tlbnppbmcuICBJbgorICAgICAgICB0aGUgUHJlbG9hZFNjYW5u ZXIsIHRoZXNlIGNvbmNlcm5zIGFyZSBjb3VwbGVkLCBidXQgd2Ugd2FudCB0byBkZWNvdXBsZQor ICAgICAgICB0aGVtLgorCisgICAgICAgICogaHRtbC9IVE1MNVRva2VuaXplci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MNVRva2VuaXplcjo6SFRNTDVUb2tlbml6ZXIpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTDVUb2tlbml6ZXI6On5IVE1MNVRva2VuaXplcik6CisgICAgICAgIChXZWJD b3JlOjpIVE1MNVRva2VuaXplcjo6YmVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVUb2tl bml6ZXI6OmVuZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuaXplcjo6cmVzZXQpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTDVUb2tlbml6ZXI6OndyaXRlKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUw1VG9rZW5pemVyOjpjb25zdW1lRW50aXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUw1VG9rZW5pemVyOjp0b2tlbml6ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuaXpl cjo6cHJvY2Vzc0F0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuaXplcjo6 ZW1pdENoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuaXplcjo6ZW1pdFRh Zyk6CisgICAgICAgICogaHRtbC9IVE1MNVRva2VuaXplci5oOgorCisyMDEwLTA1LTE3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCiAKICAgICAgICAgQWRkIEhUTUw1VG9rZW5pemVyIHRvIHRoZSBidWlsZCBzeXN0ZW0g b24gTWFjCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbml6ZXIuY3BwIGIvV2Vi Q29yZS9odG1sL0hUTUw1VG9rZW5pemVyLmNwcAppbmRleCBlZDE5Yzg1ZWFkZGRhYmFlZmFmNThi M2Y2MWRlNmJiYjQ0N2ZiMWM0Li4yNGQwMzBkZjdlNTY3MTg3ZWVhOGQ1NmJjOTdlZmYwMzVkNGQ5 YTU1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbml6ZXIuY3BwCisrKyBiL1dl YkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAKQEAgLTI5LDE3ICsyOSw2IEBACiAjaW5jbHVk ZSAiSFRNTDVUb2tlbml6ZXIuaCIKIAogI2luY2x1ZGUgIkF0b21pY1N0cmluZy5oIgotI2luY2x1 ZGUgIkNhY2hlZENTU1N0eWxlU2hlZXQuaCIKLSNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgotI2lu Y2x1ZGUgIkNhY2hlZFJlc291cmNlLmgiCi0jaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VDbGllbnQu aCIKLSNpbmNsdWRlICJDYWNoZWRTY3JpcHQuaCIKLSNpbmNsdWRlICJDU1NIZWxwZXIuaCIKLSNp bmNsdWRlICJEb2NMb2FkZXIuaCIKLSNpbmNsdWRlICJEb2N1bWVudC5oIgotI2luY2x1ZGUgIkZy YW1lLmgiCi0jaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKLSNpbmNsdWRlICJIVE1MTGlua0VsZW1l bnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+CkBAIC01OCw1MCArNDcsMzMgQEAgc3Ry dWN0IEVudGl0eSB7CiBjb25zdCBzdHJ1Y3QgRW50aXR5KiBmaW5kRW50aXR5KHJlZ2lzdGVyIGNv bnN0IGNoYXIqIHN0ciwgcmVnaXN0ZXIgdW5zaWduZWQgaW50IGxlbik7CiAjZW5kaWYKIAotI2Rl ZmluZSBQUkVMT0FEX0RFQlVHIDAKLQogdXNpbmcgbmFtZXNwYWNlIFdURjsKIAogbmFtZXNwYWNl IFdlYkNvcmUgewotICAgIAorCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwotICAgIAotSFRN TDVUb2tlbml6ZXI6OkhUTUw1VG9rZW5pemVyKERvY3VtZW50KiBkb2MpCi0gICAgOiBtX2luUHJv Z3Jlc3MoZmFsc2UpCi0gICAgLCBtX3RpbWVVc2VkKDApCi0gICAgLCBtX2JvZHlTZWVuKGZhbHNl KQotICAgICwgbV9kb2N1bWVudChkb2MpCisKK0hUTUw1VG9rZW5pemVyOjpIVE1MNVRva2VuaXpl cigpCiB7Ci0jaWYgUFJFTE9BRF9ERUJVRwotICAgIHByaW50ZigiQ1JFQVRJTkcgUFJFTE9BRCBT Q0FOTkVSIEZPUiAlc1xuIiwgbV9kb2N1bWVudC0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCkuZGF0 YSgpKTsKLSNlbmRpZgogfQotICAgIAorCiBIVE1MNVRva2VuaXplcjo6fkhUTUw1VG9rZW5pemVy KCkKIHsKLSNpZiBQUkVMT0FEX0RFQlVHCi0gICAgcHJpbnRmKCJERUxFVElORyBQUkVMT0FEIFND QU5ORVIgRk9SICVzXG4iLCBtX2RvY3VtZW50LT51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRh KCkpOwotICAgIHByaW50ZigiVE9UQUwgVElNRSBVU0VEICUuNGZzXG4iLCBtX3RpbWVVc2VkKTsK LSNlbmRpZgogfQotICAgIAorCiB2b2lkIEhUTUw1VG9rZW5pemVyOjpiZWdpbigpIAogeyAKLSAg ICBBU1NFUlQoIW1faW5Qcm9ncmVzcyk7IAogICAgIHJlc2V0KCk7IAotICAgIG1faW5Qcm9ncmVz cyA9IHRydWU7IAogfQotICAgIAorCiB2b2lkIEhUTUw1VG9rZW5pemVyOjplbmQoKSAKLXsgCi0g ICAgQVNTRVJUKG1faW5Qcm9ncmVzcyk7IAotICAgIG1faW5Qcm9ncmVzcyA9IGZhbHNlOyAKK3sK IH0KIAogdm9pZCBIVE1MNVRva2VuaXplcjo6cmVzZXQoKQogewogICAgIG1fc291cmNlLmNsZWFy KCk7Ci0gICAgCisKICAgICBtX3N0YXRlID0gRGF0YTsKICAgICBtX2VzY2FwZSA9IGZhbHNlOwog ICAgIG1fY29udGVudE1vZGVsID0gUENEQVRBOwpAQCAtMTEyLDUwICs4NCwzMiBAQCB2b2lkIEhU TUw1VG9rZW5pemVyOjpyZXNldCgpCiAgICAgbV9hdHRyaWJ1dGVOYW1lLmNsZWFyKCk7CiAgICAg bV9hdHRyaWJ1dGVWYWx1ZS5jbGVhcigpOwogICAgIG1fbGFzdFN0YXJ0VGFnID0gQXRvbWljU3Ry aW5nKCk7Ci0gICAgCi0gICAgbV91cmxUb0xvYWQgPSBTdHJpbmcoKTsKLSAgICBtX2NoYXJzZXQg PSBTdHJpbmcoKTsKLSAgICBtX2xpbmtJc1N0eWxlU2hlZXQgPSBmYWxzZTsKKwogICAgIG1fbGFz dENoYXJhY3RlckluZGV4ID0gMDsKICAgICBjbGVhckxhc3RDaGFyYWN0ZXJzKCk7Ci0gICAgCi0g ICAgbV9jc3NTdGF0ZSA9IENTU0luaXRpYWw7Ci0gICAgbV9jc3NSdWxlLmNsZWFyKCk7Ci0gICAg bV9jc3NSdWxlVmFsdWUuY2xlYXIoKTsKIH0KLSAgICAKLWJvb2wgSFRNTDVUb2tlbml6ZXI6OnNj YW5uaW5nQm9keSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fZG9jdW1lbnQtPmJvZHkoKSB8fCBt X2JvZHlTZWVuOwotfQotICAgIAorCiB2b2lkIEhUTUw1VG9rZW5pemVyOjp3cml0ZShjb25zdCBT ZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSkKIHsKLSNpZiBQUkVMT0FEX0RFQlVHCi0gICAgZG91Ymxl IHN0YXJ0VGltZSA9IGN1cnJlbnRUaW1lKCk7Ci0jZW5kaWYKICAgICB0b2tlbml6ZShzb3VyY2Up OwotI2lmIFBSRUxPQURfREVCVUcKLSAgICBtX3RpbWVVc2VkICs9IGN1cnJlbnRUaW1lKCkgLSBz dGFydFRpbWU7Ci0jZW5kaWYKIH0KLSAgICAKKwogc3RhdGljIGlubGluZSBib29sIGlzV2hpdGVz cGFjZShVQ2hhciBjKQogewogICAgIHJldHVybiBjID09ICcgJyB8fCBjID09ICdcbicgfHwgYyA9 PSAnXHInIHx8IGMgPT0gJ1x0JzsKIH0KLSAgICAKKwogaW5saW5lIHZvaWQgSFRNTDVUb2tlbml6 ZXI6OmNsZWFyTGFzdENoYXJhY3RlcnMoKQogewogICAgIG1lbXNldChtX2xhc3RDaGFyYWN0ZXJz LCAwLCBsYXN0Q2hhcmFjdGVyc0J1ZmZlclNpemUgKiBzaXplb2YoVUNoYXIpKTsKIH0KLSAgICAK KwogaW5saW5lIHZvaWQgSFRNTDVUb2tlbml6ZXI6OnJlbWVtYmVyQ2hhcmFjdGVyKFVDaGFyIGMp CiB7CiAgICAgbV9sYXN0Q2hhcmFjdGVySW5kZXggPSAobV9sYXN0Q2hhcmFjdGVySW5kZXggKyAx KSAlIGxhc3RDaGFyYWN0ZXJzQnVmZmVyU2l6ZTsKICAgICBtX2xhc3RDaGFyYWN0ZXJzW21fbGFz dENoYXJhY3RlckluZGV4XSA9IGM7CiB9Ci0gICAgCisKIGlubGluZSBib29sIEhUTUw1VG9rZW5p emVyOjpsYXN0Q2hhcmFjdGVyc01hdGNoKGNvbnN0IGNoYXIqIGNoYXJzLCB1bnNpZ25lZCBjb3Vu dCkgY29uc3QKIHsKICAgICB1bnNpZ25lZCBwb3MgPSBtX2xhc3RDaGFyYWN0ZXJJbmRleDsKQEAg LTE5Miw3ICsxNDYsNyBAQCB1bnNpZ25lZCBIVE1MNVRva2VuaXplcjo6Y29uc3VtZUVudGl0eShT ZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgYm9vbCYgbm90RW5vdWdoQwogICAgIHVuc2lnbmVkIHJl c3VsdCA9IDA7CiAgICAgVmVjdG9yPFVDaGFyLCAxMD4gc2VlbkNoYXJzOwogICAgIFZlY3Rvcjxj aGFyLCAxMD4gZW50aXR5TmFtZTsKLSAgICAKKwogICAgIHdoaWxlICghc291cmNlLmlzRW1wdHko KSkgewogICAgICAgICBVQ2hhciBjYyA9ICpzb3VyY2U7CiAgICAgICAgIHNlZW5DaGFycy5hcHBl bmQoY2MpOwpAQCAtMjk4LDggKzI1Miw2IEBAIG91dE9mQ2hhcmFjdGVyczoKIAogdm9pZCBIVE1M NVRva2VuaXplcjo6dG9rZW5pemUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiB7Ci0g ICAgQVNTRVJUKG1faW5Qcm9ncmVzcyk7Ci0gICAgCiAgICAgbV9zb3VyY2UuYXBwZW5kKHNvdXJj ZSk7CiAKICAgICAvLyBUaGlzIGlzIGEgc2ltcGxpZmllZCBIVE1MNSBUb2tlbml6ZXIKQEAgLTM1 NywxMyArMzA5LDExIEBAIHZvaWQgSFRNTDVUb2tlbml6ZXI6OnRva2VuaXplKGNvbnN0IFNlZ21l bnRlZFN0cmluZyYgc291cmNlKQogICAgICAgICAgICAgICAgICAgICBtX3N0YXRlID0gQ2xvc2VU YWdPcGVuOwogICAgICAgICAgICAgICAgIGVsc2UgaWYgKGNjID49ICdBJyAmJiBjYyA8PSAnWicp IHsKICAgICAgICAgICAgICAgICAgICAgbV90YWdOYW1lLmNsZWFyKCk7Ci0gICAgICAgICAgICAg ICAgICAgIG1fY2hhcnNldCA9IFN0cmluZygpOwogICAgICAgICAgICAgICAgICAgICBtX3RhZ05h bWUuYXBwZW5kKGNjICsgMHgyMCk7CiAgICAgICAgICAgICAgICAgICAgIG1fY2xvc2VUYWcgPSBm YWxzZTsKICAgICAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IFRhZ05hbWU7CiAgICAgICAgICAg ICAgICAgfSBlbHNlIGlmIChjYyA+PSAnYScgJiYgY2MgPD0gJ3onKSB7CiAgICAgICAgICAgICAg ICAgICAgIG1fdGFnTmFtZS5jbGVhcigpOwotICAgICAgICAgICAgICAgICAgICBtX2NoYXJzZXQg PSBTdHJpbmcoKTsKICAgICAgICAgICAgICAgICAgICAgbV90YWdOYW1lLmFwcGVuZChjYyk7CiAg ICAgICAgICAgICAgICAgICAgIG1fY2xvc2VUYWcgPSBmYWxzZTsKICAgICAgICAgICAgICAgICAg ICAgbV9zdGF0ZSA9IFRhZ05hbWU7CkBAIC00MDMsMTMgKzM1MywxMSBAQCB2b2lkIEhUTUw1VG9r ZW5pemVyOjp0b2tlbml6ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSkKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIGlmIChjYyA+PSAnQScgJiYgY2MgPD0gJ1onKSB7CiAgICAgICAg ICAgICAgICAgbV90YWdOYW1lLmNsZWFyKCk7Ci0gICAgICAgICAgICAgICAgbV9jaGFyc2V0ID0g U3RyaW5nKCk7CiAgICAgICAgICAgICAgICAgbV90YWdOYW1lLmFwcGVuZChjYyArIDB4MjApOwog ICAgICAgICAgICAgICAgIG1fY2xvc2VUYWcgPSB0cnVlOwogICAgICAgICAgICAgICAgIG1fc3Rh dGUgPSBUYWdOYW1lOwogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA+PSAnYScgJiYgY2MgPD0g J3onKSB7CiAgICAgICAgICAgICAgICAgbV90YWdOYW1lLmNsZWFyKCk7Ci0gICAgICAgICAgICAg ICAgbV9jaGFyc2V0ID0gU3RyaW5nKCk7CiAgICAgICAgICAgICAgICAgbV90YWdOYW1lLmFwcGVu ZChjYyk7CiAgICAgICAgICAgICAgICAgbV9jbG9zZVRhZyA9IHRydWU7CiAgICAgICAgICAgICAg ICAgbV9zdGF0ZSA9IFRhZ05hbWU7CkBAIC02ODgsMTI3ICs2MzYsMzAgQEAgdm9pZCBIVE1MNVRv a2VuaXplcjo6dG9rZW5pemUoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAgICAgICAg IG1fc291cmNlLmFkdmFuY2UoKTsKICAgICB9CiB9Ci0gICAgCisKIHZvaWQgSFRNTDVUb2tlbml6 ZXI6OnByb2Nlc3NBdHRyaWJ1dGUoKQogewogICAgIEF0b21pY1N0cmluZyB0YWcgPSBBdG9taWNT dHJpbmcobV90YWdOYW1lLmRhdGEoKSwgbV90YWdOYW1lLnNpemUoKSk7CiAgICAgQXRvbWljU3Ry aW5nIGF0dHJpYnV0ZSA9IEF0b21pY1N0cmluZyhtX2F0dHJpYnV0ZU5hbWUuZGF0YSgpLCBtX2F0 dHJpYnV0ZU5hbWUuc2l6ZSgpKTsKLSAgICAKKwogICAgIFN0cmluZyB2YWx1ZShtX2F0dHJpYnV0 ZVZhbHVlLmRhdGEoKSwgbV9hdHRyaWJ1dGVWYWx1ZS5zaXplKCkpOwotICAgIGlmICh0YWcgPT0g c2NyaXB0VGFnIHx8IHRhZyA9PSBpbWdUYWcpIHsKLSAgICAgICAgaWYgKGF0dHJpYnV0ZSA9PSBz cmNBdHRyICYmIG1fdXJsVG9Mb2FkLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fdXJsVG9Mb2Fk ID0gZGVwcmVjYXRlZFBhcnNlVVJMKHZhbHVlKTsKLSAgICAgICAgZWxzZSBpZiAoYXR0cmlidXRl ID09IGNoYXJzZXRBdHRyKQotICAgICAgICAgICAgbV9jaGFyc2V0ID0gdmFsdWU7Ci0gICAgfSBl bHNlIGlmICh0YWcgPT0gbGlua1RhZykgewotICAgICAgICBpZiAoYXR0cmlidXRlID09IGhyZWZB dHRyICYmIG1fdXJsVG9Mb2FkLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fdXJsVG9Mb2FkID0g ZGVwcmVjYXRlZFBhcnNlVVJMKHZhbHVlKTsKLSAgICAgICAgZWxzZSBpZiAoYXR0cmlidXRlID09 IHJlbEF0dHIpIHsKLSAgICAgICAgICAgIEhUTUxMaW5rRWxlbWVudDo6UmVsQXR0cmlidXRlIHJl bDsKLSAgICAgICAgICAgIEhUTUxMaW5rRWxlbWVudDo6dG9rZW5pemVSZWxBdHRyaWJ1dGUodmFs dWUsIHJlbCk7Ci0gICAgICAgICAgICBtX2xpbmtJc1N0eWxlU2hlZXQgPSByZWwubV9pc1N0eWxl U2hlZXQgJiYgIXJlbC5tX2lzQWx0ZXJuYXRlICYmICFyZWwubV9pc0ljb24gJiYgIXJlbC5tX2lz RE5TUHJlZmV0Y2g7Ci0gICAgICAgIH0gZWxzZSBpZiAoYXR0cmlidXRlID09IGNoYXJzZXRBdHRy KQotICAgICAgICAgICAgbV9jaGFyc2V0ID0gdmFsdWU7Ci0gICAgfQogfQotICAgIAotaW5saW5l IHZvaWQgSFRNTDVUb2tlbml6ZXI6OmVtaXRDaGFyYWN0ZXIoVUNoYXIgYykKKworaW5saW5lIHZv aWQgSFRNTDVUb2tlbml6ZXI6OmVtaXRDaGFyYWN0ZXIoVUNoYXIpCiB7Ci0gICAgaWYgKG1fY29u dGVudE1vZGVsID09IENEQVRBICYmIG1fbGFzdFN0YXJ0VGFnID09IHN0eWxlVGFnKSAKLSAgICAg ICAgdG9rZW5pemVDU1MoYyk7Ci19Ci0gICAgCi1pbmxpbmUgdm9pZCBIVE1MNVRva2VuaXplcjo6 dG9rZW5pemVDU1MoVUNoYXIgYykKLXsgICAgCi0gICAgLy8gV2UgYXJlIGp1c3QgaW50ZXJlc3Rl ZCBpbiBAaW1wb3J0IHJ1bGVzLCBubyBuZWVkIGZvciByZWFsIHRva2VuaXphdGlvbiBoZXJlCi0g ICAgLy8gU2VhcmNoaW5nIGZvciBvdGhlciB0eXBlcyBvZiByZXNvdXJjZXMgaXMgcHJvYmFibHkg bG93IHBheW9mZgotICAgIHN3aXRjaCAobV9jc3NTdGF0ZSkgewotICAgIGNhc2UgQ1NTSW5pdGlh bDoKLSAgICAgICAgaWYgKGMgPT0gJ0AnKQotICAgICAgICAgICAgbV9jc3NTdGF0ZSA9IENTU1J1 bGVTdGFydDsKLSAgICAgICAgZWxzZSBpZiAoYyA9PSAnLycpCi0gICAgICAgICAgICBtX2Nzc1N0 YXRlID0gQ1NTTWF5YmVDb21tZW50OwotICAgICAgICBicmVhazsKLSAgICBjYXNlIENTU01heWJl Q29tbWVudDoKLSAgICAgICAgaWYgKGMgPT0gJyonKQotICAgICAgICAgICAgbV9jc3NTdGF0ZSA9 IENTU0NvbW1lbnQ7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJ bml0aWFsOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIENTU0NvbW1lbnQ6Ci0gICAgICAgIGlm IChjID09ICcqJykKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NNYXliZUNvbW1lbnRFbmQ7 Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ1NTTWF5YmVDb21tZW50RW5kOgotICAgICAgICBp ZiAoYyA9PSAnLycpCi0gICAgICAgICAgICBtX2Nzc1N0YXRlID0gQ1NTSW5pdGlhbDsKLSAgICAg ICAgZWxzZSBpZiAoYyA9PSAnKicpCi0gICAgICAgICAgICA7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIG1fY3NzU3RhdGUgPSBDU1NDb21tZW50OwotICAgICAgICBicmVhazsKLSAgICBjYXNl IENTU1J1bGVTdGFydDoKLSAgICAgICAgaWYgKChjID49ICdBJyAmJiBjIDw9ICdaJykgfHwgKGMg Pj0gJ2EnICYmIGMgPD0gJ3onKSkgewotICAgICAgICAgICAgbV9jc3NSdWxlLmNsZWFyKCk7Ci0g ICAgICAgICAgICBtX2Nzc1J1bGVWYWx1ZS5jbGVhcigpOwotICAgICAgICAgICAgbV9jc3NSdWxl LmFwcGVuZChjKTsKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NSdWxlOwotICAgICAgICB9 IGVsc2UKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJbml0aWFsOwotICAgICAgICBicmVh azsKLSAgICBjYXNlIENTU1J1bGU6Ci0gICAgICAgIGlmIChpc1doaXRlc3BhY2UoYykpCi0gICAg ICAgICAgICBtX2Nzc1N0YXRlID0gQ1NTQWZ0ZXJSdWxlOwotICAgICAgICBlbHNlIGlmIChjID09 ICc7JykKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJbml0aWFsOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICBtX2Nzc1J1bGUuYXBwZW5kKGMpOwotICAgICAgICBicmVhazsKLSAgICBj YXNlIENTU0FmdGVyUnVsZToKLSAgICAgICAgaWYgKGlzV2hpdGVzcGFjZShjKSkKLSAgICAgICAg ICAgIDsKLSAgICAgICAgZWxzZSBpZiAoYyA9PSAnOycpCi0gICAgICAgICAgICBtX2Nzc1N0YXRl ID0gQ1NTSW5pdGlhbDsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBtX2Nzc1N0YXRlID0g Q1NTUnVsZVZhbHVlOwotICAgICAgICAgICAgbV9jc3NSdWxlVmFsdWUuYXBwZW5kKGMpOwotICAg ICAgICB9Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ1NTUnVsZVZhbHVlOgotICAgICAgICBp ZiAoaXNXaGl0ZXNwYWNlKGMpKQotICAgICAgICAgICAgbV9jc3NTdGF0ZSA9IENTU0FmdGVyUnVs ZVZhbHVlOwotICAgICAgICBlbHNlIGlmIChjID09ICc7JykgewotICAgICAgICAgICAgZW1pdENT U1J1bGUoKTsKLSAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJbml0aWFsOwotICAgICAgICB9 IGVsc2UgCi0gICAgICAgICAgICBtX2Nzc1J1bGVWYWx1ZS5hcHBlbmQoYyk7Ci0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgQ1NTQWZ0ZXJSdWxlVmFsdWU6Ci0gICAgICAgIGlmIChpc1doaXRlc3Bh Y2UoYykpCi0gICAgICAgICAgICA7Ci0gICAgICAgIGVsc2UgaWYgKGMgPT0gJzsnKSB7Ci0gICAg ICAgICAgICBlbWl0Q1NTUnVsZSgpOwotICAgICAgICAgICAgbV9jc3NTdGF0ZSA9IENTU0luaXRp YWw7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBGSVhNRSBtZWRpYSBydWxlcwot ICAgICAgICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJbml0aWFsOwotICAgICAgICB9Ci0gICAgICAg IGJyZWFrOwotICAgIH0KIH0KLSAgICAKKwogdm9pZCBIVE1MNVRva2VuaXplcjo6ZW1pdFRhZygp CiB7CiAgICAgaWYgKG1fY2xvc2VUYWcpIHsKICAgICAgICAgbV9jb250ZW50TW9kZWwgPSBQQ0RB VEE7Ci0gICAgICAgIG1fY3NzU3RhdGUgPSBDU1NJbml0aWFsOwogICAgICAgICBjbGVhckxhc3RD aGFyYWN0ZXJzKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgCisKICAgICBBdG9taWNT dHJpbmcgdGFnKG1fdGFnTmFtZS5kYXRhKCksIG1fdGFnTmFtZS5zaXplKCkpOwogICAgIG1fbGFz dFN0YXJ0VGFnID0gdGFnOwotICAgIAorCiAgICAgaWYgKHRhZyA9PSB0ZXh0YXJlYVRhZyB8fCB0 YWcgPT0gdGl0bGVUYWcpCiAgICAgICAgIG1fY29udGVudE1vZGVsID0gUkNEQVRBOwogICAgIGVs c2UgaWYgKHRhZyA9PSBzdHlsZVRhZyB8fCB0YWcgPT0geG1wVGFnIHx8IHRhZyA9PSBzY3JpcHRU YWcgfHwgdGFnID09IGlmcmFtZVRhZyB8fCB0YWcgPT0gbm9lbWJlZFRhZyB8fCB0YWcgPT0gbm9m cmFtZXNUYWcpCkBAIC04MjAsMzggKzY3MSw2IEBAIHZvaWQgSFRNTDVUb2tlbml6ZXI6OmVtaXRU YWcoKQogICAgICAgICBtX2NvbnRlbnRNb2RlbCA9IFBMQUlOVEVYVDsKICAgICBlbHNlCiAgICAg ICAgIG1fY29udGVudE1vZGVsID0gUENEQVRBOwotICAgIAotICAgIGlmICh0YWcgPT0gYm9keVRh ZykKLSAgICAgICAgbV9ib2R5U2VlbiA9IHRydWU7Ci0gICAgCi0gICAgaWYgKG1fdXJsVG9Mb2Fk LmlzRW1wdHkoKSkgewotICAgICAgICBtX2xpbmtJc1N0eWxlU2hlZXQgPSBmYWxzZTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLSAgICAKLSAgICBpZiAodGFnID09IHNjcmlwdFRhZykKLSAgICAg ICAgbV9kb2N1bWVudC0+ZG9jTG9hZGVyKCktPnByZWxvYWQoQ2FjaGVkUmVzb3VyY2U6OlNjcmlw dCwgbV91cmxUb0xvYWQsIG1fY2hhcnNldCwgc2Nhbm5pbmdCb2R5KCkpOwotICAgIGVsc2UgaWYg KHRhZyA9PSBpbWdUYWcpIAotICAgICAgICBtX2RvY3VtZW50LT5kb2NMb2FkZXIoKS0+cHJlbG9h ZChDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZSwgbV91cmxUb0xvYWQsIFN0cmluZygpLCBz Y2FubmluZ0JvZHkoKSk7Ci0gICAgZWxzZSBpZiAodGFnID09IGxpbmtUYWcgJiYgbV9saW5rSXNT dHlsZVNoZWV0KSAKLSAgICAgICAgbV9kb2N1bWVudC0+ZG9jTG9hZGVyKCktPnByZWxvYWQoQ2Fj aGVkUmVzb3VyY2U6OkNTU1N0eWxlU2hlZXQsIG1fdXJsVG9Mb2FkLCBtX2NoYXJzZXQsIHNjYW5u aW5nQm9keSgpKTsKLQotICAgIG1fdXJsVG9Mb2FkID0gU3RyaW5nKCk7Ci0gICAgbV9jaGFyc2V0 ID0gU3RyaW5nKCk7Ci0gICAgbV9saW5rSXNTdHlsZVNoZWV0ID0gZmFsc2U7Ci19Ci0gICAgCi12 b2lkIEhUTUw1VG9rZW5pemVyOjplbWl0Q1NTUnVsZSgpCi17Ci0gICAgU3RyaW5nIHJ1bGUobV9j c3NSdWxlLmRhdGEoKSwgbV9jc3NSdWxlLnNpemUoKSk7Ci0gICAgaWYgKGVxdWFsSWdub3JpbmdD YXNlKHJ1bGUsICJpbXBvcnQiKSAmJiAhbV9jc3NSdWxlVmFsdWUuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIFN0cmluZyB2YWx1ZShtX2Nzc1J1bGVWYWx1ZS5kYXRhKCksIG1fY3NzUnVsZVZhbHVlLnNp emUoKSk7Ci0gICAgICAgIFN0cmluZyB1cmwgPSBkZXByZWNhdGVkUGFyc2VVUkwodmFsdWUpOwot ICAgICAgICBpZiAoIXVybC5pc0VtcHR5KCkpCi0gICAgICAgICAgICBtX2RvY3VtZW50LT5kb2NM b2FkZXIoKS0+cHJlbG9hZChDYWNoZWRSZXNvdXJjZTo6Q1NTU3R5bGVTaGVldCwgdXJsLCBTdHJp bmcoKSwgc2Nhbm5pbmdCb2R5KCkpOwotICAgIH0KLSAgICBtX2Nzc1J1bGUuY2xlYXIoKTsKLSAg ICBtX2Nzc1J1bGVWYWx1ZS5jbGVhcigpOwogfQotICAgICAgICAgICAgICAgIAorCiB9CmRpZmYg LS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbml6ZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1M NVRva2VuaXplci5oCmluZGV4IDhlZGU1ZGE4YzNiMzg0NDYxMzAzYTg5YTRlOTI4YjA1ZmIxMjE4 Y2YuLmU3NTU4OTFiZmU2YjdkZTQ0ZTM3YmE5ZGVlYjhlMTNiYWM2ODllZTAgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRv a2VuaXplci5oCkBAIC0zMyw0NCArMzMsMzMgQEAKICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKLSAgICAKLSAgICBjbGFzcyBDYWNoZWRSZXNvdXJjZTsKLSAg ICBjbGFzcyBDYWNoZWRSZXNvdXJjZUNsaWVudDsKLSAgICBjbGFzcyBEb2N1bWVudDsKLSAgICAK KwogICAgIGNsYXNzIEhUTUw1VG9rZW5pemVyIDogcHVibGljIE5vbmNvcHlhYmxlIHsKICAgICBw dWJsaWM6Ci0gICAgICAgIEhUTUw1VG9rZW5pemVyKERvY3VtZW50Kik7CisgICAgICAgIEhUTUw1 VG9rZW5pemVyKCk7CiAgICAgICAgIH5IVE1MNVRva2VuaXplcigpOworCiAgICAgICAgIHZvaWQg YmVnaW4oKTsKICAgICAgICAgdm9pZCB3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmKTsKICAg ICAgICAgdm9pZCBlbmQoKTsKLSAgICAgICAgYm9vbCBpblByb2dyZXNzKCkgY29uc3QgeyByZXR1 cm4gbV9pblByb2dyZXNzOyB9Ci0gICAgICAgIAotICAgICAgICBib29sIHNjYW5uaW5nQm9keSgp IGNvbnN0OwotICAgICAgICAKKwogICAgICAgICBzdGF0aWMgdW5zaWduZWQgY29uc3VtZUVudGl0 eShTZWdtZW50ZWRTdHJpbmcmLCBib29sJiBub3RFbm91Z2hDaGFyYWN0ZXJzKTsKLSAgICAgICAg CisKICAgICBwcml2YXRlOgogICAgICAgICB2b2lkIHRva2VuaXplKGNvbnN0IFNlZ21lbnRlZFN0 cmluZyYpOwogICAgICAgICB2b2lkIHJlc2V0KCk7Ci0gICAgICAgIAorCiAgICAgICAgIHZvaWQg ZW1pdFRhZygpOwogICAgICAgICB2b2lkIGVtaXRDaGFyYWN0ZXIoVUNoYXIpOwotICAgICAgICAK LSAgICAgICAgdm9pZCB0b2tlbml6ZUNTUyhVQ2hhcik7Ci0gICAgICAgIHZvaWQgZW1pdENTU1J1 bGUoKTsKLSAgICAgICAgCisKICAgICAgICAgdm9pZCBwcm9jZXNzQXR0cmlidXRlKCk7CiAKLSAg ICAgICAgCiAgICAgICAgIHZvaWQgY2xlYXJMYXN0Q2hhcmFjdGVycygpOwogICAgICAgICB2b2lk IHJlbWVtYmVyQ2hhcmFjdGVyKFVDaGFyKTsKICAgICAgICAgYm9vbCBsYXN0Q2hhcmFjdGVyc01h dGNoKGNvbnN0IGNoYXIqLCB1bnNpZ25lZCBjb3VudCkgY29uc3Q7Ci0gICAgICAgIAotICAgICAg ICBib29sIG1faW5Qcm9ncmVzczsKKwogICAgICAgICBTZWdtZW50ZWRTdHJpbmcgbV9zb3VyY2U7 Ci0gICAgICAgIAorCiAgICAgICAgIGVudW0gU3RhdGUgewogICAgICAgICAgICAgRGF0YSwKICAg ICAgICAgICAgIEVudGl0eURhdGEsCkBAIC0xMDQsNDAgKzkzLDE2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgQ29udGVudE1vZGVsIG1fY29udGVudE1vZGVsOwogICAgICAgICB1bnNp Z25lZCBtX2NvbW1lbnRQb3M7CiAgICAgICAgIFN0YXRlIG1fc3RhdGVCZWZvcmVFbnRpdHlJbkF0 dHJpYnV0ZVZhbHVlOwotICAgICAgICAKKwogICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQg bGFzdENoYXJhY3RlcnNCdWZmZXJTaXplID0gODsKICAgICAgICAgVUNoYXIgbV9sYXN0Q2hhcmFj dGVyc1tsYXN0Q2hhcmFjdGVyc0J1ZmZlclNpemVdOwogICAgICAgICB1bnNpZ25lZCBtX2xhc3RD aGFyYWN0ZXJJbmRleDsKLSAgICAgICAgCisKICAgICAgICAgYm9vbCBtX2Nsb3NlVGFnOwogICAg ICAgICBWZWN0b3I8VUNoYXIsIDMyPiBtX3RhZ05hbWU7CiAgICAgICAgIFZlY3RvcjxVQ2hhciwg MzI+IG1fYXR0cmlidXRlTmFtZTsKICAgICAgICAgVmVjdG9yPFVDaGFyPiBtX2F0dHJpYnV0ZVZh bHVlOwogICAgICAgICBBdG9taWNTdHJpbmcgbV9sYXN0U3RhcnRUYWc7Ci0gICAgICAgIAotICAg ICAgICBTdHJpbmcgbV91cmxUb0xvYWQ7Ci0gICAgICAgIFN0cmluZyBtX2NoYXJzZXQ7Ci0gICAg ICAgIGJvb2wgbV9saW5rSXNTdHlsZVNoZWV0OwotICAgICAgICAKLSAgICAgICAgZW51bSBDU1NT dGF0ZSB7Ci0gICAgICAgICAgICBDU1NJbml0aWFsLAotICAgICAgICAgICAgQ1NTTWF5YmVDb21t ZW50LAotICAgICAgICAgICAgQ1NTQ29tbWVudCwKLSAgICAgICAgICAgIENTU01heWJlQ29tbWVu dEVuZCwKLSAgICAgICAgICAgIENTU1J1bGVTdGFydCwKLSAgICAgICAgICAgIENTU1J1bGUsCi0g ICAgICAgICAgICBDU1NBZnRlclJ1bGUsCi0gICAgICAgICAgICBDU1NSdWxlVmFsdWUsCi0gICAg ICAgICAgICBDU1NBZnRlclJ1bGVWYWx1ZQotICAgICAgICB9OwotICAgICAgICBDU1NTdGF0ZSBt X2Nzc1N0YXRlOwotICAgICAgICBWZWN0b3I8VUNoYXIsIDE2PiBtX2Nzc1J1bGU7Ci0gICAgICAg IFZlY3RvcjxVQ2hhcj4gbV9jc3NSdWxlVmFsdWU7Ci0gICAgICAgIAotICAgICAgICBkb3VibGUg bV90aW1lVXNlZDsKLSAgICAgICAgCi0gICAgICAgIGJvb2wgbV9ib2R5U2VlbjsKLSAgICAgICAg RG9jdW1lbnQqIG1fZG9jdW1lbnQ7CiAgICAgfTsKIAogfQo=