53279 2011-01-27 18:52:09 -0800 Teach XSSFilter how to filter <script> elements 2011-01-28 14:37:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 49845 1 abarth abarth abarth dbates eric sam webkit.review.bot oldest_to_newest 341244 0 abarth 2011-01-27 18:52:09 -0800 Teach XSSFilter how to filter <script> elements 341246 1 80400 abarth 2011-01-27 19:03:53 -0800 Created attachment 80400 Patch 341456 2 80400 dbates 2011-01-28 08:35:59 -0800 Comment on attachment 80400 Patch Looks good to me. r=me 341687 3 80400 abarth 2011-01-28 13:31:23 -0800 Comment on attachment 80400 Patch Clearing flags on attachment: 80400 Committed r76981: <http://trac.webkit.org/changeset/76981> 341688 4 abarth 2011-01-28 13:31:27 -0800 All reviewed patches have been landed. Closing bug. 341748 5 webkit.review.bot 2011-01-28 14:37:44 -0800 http://trac.webkit.org/changeset/76981 might have broken Leopard Intel Release (Tests) 80400 2011-01-27 19:03:53 -0800 2011-01-28 13:31:23 -0800 Patch bug-53279-20110127190352.patch text/plain 9341 abarth ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MjE1M2U2MjRiOTc5Y2YxY2RjYjQ2Mzc4ZmFiODY2OGI5NDk0N2VhLi4w MDVmMjI1MmFiNDNjMGUyMTk5ODhkMWY2Yzk1ZjE2MjZmZjFmYjhlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0y LDYgKzIsNDkgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAg ICAgICBUZWFjaCBYU1NGaWx0ZXIgaG93IHRvIGZpbHRlciA8c2NyaXB0PiBlbGVtZW50cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMyNzkKKworICAg ICAgICBUaGlzIHBhdGNoIGFkZHMgdGhlIGFiaWxpdHkgZm9yIHRoZSBYU1NGaWx0ZXIgdG8gYmxv Y2sgaW5qZWN0ZWQKKyAgICAgICAgPHNjcmlwdD4gZWxlbWVudHMuICBIYW5kbGluZyBzY3JpcHQg ZWxlbWVudHMgaXMgc2xpZ2h0bHkgc3VidGxlIGJlY2F1c2UKKyAgICAgICAgdGhlc2UgZWxlbWVu dHMgYWN0IHZlcnkgZGlmZmVyZW50bHkgZGVwZW5kaW5nIG9uIHdoZXRoZXIgdGhleSBoYXZlIGEK KyAgICAgICAgc3JjIGF0dHJpYnV0ZS4KKyAgICAgICAgCisgICAgICAgIEluIHRoZSAic3JjIGNh c2UiLCB3aGljaCBjaGVjayB3aGV0aGVyIHRoZSBzcmMgYXR0cmlidXRlIHdhcyBwcmVzZW50IGlu CisgICAgICAgIHRoZSByZXF1ZXN0LiAgSW4gdGhlICJub24tc3JjIGNhc2UiLCB3ZSBjaGVjayB3 aGV0aGVyIHRoZSBzdGFydCB0YWcgYW5kCisgICAgICAgIHRoZSBib2R5IG9mIHRoZSBzY3JpcHQg ZWxlbWVudCB3YXMgaW5jbHVkZWQgaW4gdGhlIHJlcXVlc3QuICBDaGVja2luZworICAgICAgICBm b3IgdGhlIHdob2xlIHN0YXJ0IHRhZyBtZWFucyB3ZSBtaXNzIG91dCBvbiBzb21lIGF0dHJpYnV0 ZSBzcGxpdHRpbmcKKyAgICAgICAgYXR0YWNrcyBpbnNpZGUgb2Ygc2NyaXB0IHRhZ3MsIGJ1dCB0 aGF0IGRvZXNuJ3Qgc2VlbSBsaWtlIHRoYXQgYmlnIGEKKyAgICAgICAgZGVhbC4KKworICAgICAg ICBUaGlzIHBhdGNoIGFsc28gaW50cm9kdWNlcyBzb21lIGFtb3VudCBvZiBzdGF0ZSBpbnRvIHRo ZSBYU1NGaWx0ZXIKKyAgICAgICAgYmVjYXVzZSBpbmxpbmUgc2NyaXB0IGVsZW1lbnRzIHNwYW4g bXVsdGlwbGUgdG9rZW5zLiAgVGhlcmUncyBhIGxvdCBvZgorICAgICAgICB0dW5pbmcgYW5kIG9w dGltaXphdGlvbiBsZWZ0IGluIHRoZXNlIGNhc2VzLCBzb21lIG9mIHdoaWNoIEkndmUgbm90ZWQK KyAgICAgICAgd2l0aCBGSVhNRXMuCisKKyAgICAgICAgVG8gdGVzdCB0aGlzIHBhdGNoLCBJIHBs YXllZCBhcm91bmQgd2l0aCBzb21lIG9mIHRoZSBleGlzdGluZworICAgICAgICBYU1NBdWRpdG9y IHRlc3RzLiAgSG9wZWZ1bGx5IEknbGwgYmUgYWJsZSB0byBydW4gdGhlIHRlc3Qgc3VpdGUgbW9y ZQorICAgICAgICBzeXN0ZW1hdGljYWxseSBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogaHRt bC9wYXJzZXIvSFRNTFRva2VuLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmVyYXNl Q2hhcmFjdGVycyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9rZW46OmVyYXNlVmFsdWVPZkF0 dHJpYnV0ZSk6CisgICAgICAgICogaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxOYW1lczo6aGFzTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTmFt ZXM6OmZpbmRBdHRyaWJ1dGVXaXRoTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTmFtZXM6 OmlzTmFtZU9mU2NyaXB0Q2FycnlpbmdBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6WFNT RmlsdGVyOjpYU1NGaWx0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6WFNTRmlsdGVyOjpmaWx0ZXJU b2tlbik6CisgICAgICAgIChXZWJDb3JlOjpYU1NGaWx0ZXI6OmZpbHRlclRva2VuQWZ0ZXJTY3Jp cHRTdGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpYU1NGaWx0ZXI6OmZpbHRlclNjcmlwdFRv a2VuKToKKyAgICAgICAgKFdlYkNvcmU6OlhTU0ZpbHRlcjo6c25pcHBldEZvclJhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OlhTU0ZpbHRlcjo6c25pcHBldEZvckF0dHJpYnV0ZSk6CisgICAgICAg ICogaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmg6CisKKzIwMTEtMDEtMjcgIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KwogICAgICAgICBTa2V0Y2ggb3V0IG5ldyBYU1MgZmlsdGVyIGRlc2lnbiAoZGlzYWJsZWQgYnkg ZGVmYXVsdCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzMjA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUb2tl bi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2VuLmgKaW5kZXggYTJhZjJh NDBjNTM4ODZlNGRkNDQyZDk0NTkwOThhYjkxNTUzYjRjMi4uY2NiY2RmZDE3Nzc0MzIxODJlZGNh ZWE0MWM4ZmQzNTc3YjA4ZTk2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTFRva2VuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRva2Vu LmgKQEAgLTI0Niw2ICsyNDYsMTggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9kYXRhOwog ICAgIH0KIAorICAgIHZvaWQgZXJhc2VDaGFyYWN0ZXJzKCkKKyAgICB7CisgICAgICAgIEFTU0VS VChtX3R5cGUgPT0gQ2hhcmFjdGVyKTsKKyAgICAgICAgbV9kYXRhLmNsZWFyKCk7CisgICAgfQor CisgICAgdm9pZCBlcmFzZVZhbHVlT2ZBdHRyaWJ1dGUoc2l6ZV90IGkpCisgICAgeworICAgICAg ICBBU1NFUlQobV90eXBlID09IFN0YXJ0VGFnIHx8IG1fdHlwZSA9PSBFbmRUYWcpOworICAgICAg ICBtX2F0dHJpYnV0ZXNbaV0ubV92YWx1ZS5jbGVhcigpOworICAgIH0KKwogICAgIGNvbnN0IERh dGFWZWN0b3ImIGNoYXJhY3RlcnMoKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1fdHlw ZSA9PSBDaGFyYWN0ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv WFNTRmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1hTU0ZpbHRlci5jcHAK aW5kZXggZTYzZmNiMzIzOTI5ZTI4Zjk3YmI3N2JmYzRlZjY1ZTVhMmQ2ODdlOC4uOTJlYTM4YTY4 MmQ5OGQyMGMwNGNmYzZlOWI4NWJiMGQ0MzljZjQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9YU1NGaWx0ZXIuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJEb2N1bWVu dC5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudFBhcnNlci5oIgorI2luY2x1ZGUgIkhUTUxOYW1l cy5oIgogI2luY2x1ZGUgIlRleHRFbmNvZGluZy5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJjZURl Y29kZXIuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC0zNywxOCArMzgsMzIg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwor CiBuYW1lc3BhY2UgewogCitib29sIGhhc05hbWUoY29uc3QgSFRNTFRva2VuJiB0b2tlbiwgY29u c3QgUXVhbGlmaWVkTmFtZSYgbmFtZSkKK3sKKyAgICByZXR1cm4gZXF1YWxJZ25vcmluZ051bGxp dHkodG9rZW4ubmFtZSgpLCBzdGF0aWNfY2FzdDxjb25zdCBTdHJpbmcmPihuYW1lLmxvY2FsTmFt ZSgpKSk7Cit9CisKK2Jvb2wgZmluZEF0dHJpYnV0ZVdpdGhOYW1lKGNvbnN0IEhUTUxUb2tlbiYg dG9rZW4sIGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIHNpemVfdCYgaW5kZXhPZk1hdGNoaW5n QXR0cmlidXRlKQoreworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdG9rZW4uYXR0cmlidXRl cygpLnNpemUoKTsgKytpKSB7CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nTnVsbGl0eSh0b2tl bi5hdHRyaWJ1dGVzKCkuYXQoaSkubV9uYW1lLCBuYW1lLmxvY2FsTmFtZSgpKSkgeworICAgICAg ICAgICAgaW5kZXhPZk1hdGNoaW5nQXR0cmlidXRlID0gaTsKKyAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogYm9vbCBpc05h bWVPZlNjcmlwdENhcnJ5aW5nQXR0cmlidXRlKGNvbnN0IFZlY3RvcjxVQ2hhciwgMzI+JiBuYW1l KQogewogICAgIGNvbnN0IHNpemVfdCBsZW5ndGhPZlNob3J0ZXN0U2NyaXB0Q2FycnlpbmdBdHRy aWJ1dGUgPSA1OyAvLyBUbyB3aXQ6IG9uY3V0LgogICAgIGlmIChuYW1lLnNpemUoKSA8IGxlbmd0 aE9mU2hvcnRlc3RTY3JpcHRDYXJyeWluZ0F0dHJpYnV0ZSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIGlmIChuYW1lWzBdICE9ICdvJyAmJiBuYW1lWzBdICE9ICdPJykKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIGlmIChuYW1lWzFdICE9ICduJyAmJiBuYW1lWzBdICE9ICdOJykKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBuYW1lWzBd ID09ICdvJyAmJiBuYW1lWzFdID09ICduJzsKIH0KIAogU3RyaW5nIGRlY29kZVVSTChjb25zdCBT dHJpbmcmIHN0cmluZywgY29uc3QgVGV4dEVuY29kaW5nJiBlbmNvZGluZykKQEAgLTY4LDYgKzgz LDcgQEAgU3RyaW5nIGRlY29kZVVSTChjb25zdCBTdHJpbmcmIHN0cmluZywgY29uc3QgVGV4dEVu Y29kaW5nJiBlbmNvZGluZykKIAogWFNTRmlsdGVyOjpYU1NGaWx0ZXIoSFRNTERvY3VtZW50UGFy c2VyKiBwYXJzZXIpCiAgICAgOiBtX3BhcnNlcihwYXJzZXIpCisgICAgLCBtX3N0YXRlKEluaXRp YWwpCiB7CiAgICAgQVNTRVJUKG1fcGFyc2VyKTsKIH0KQEAgLTc4LDMwICs5NCw4NyBAQCB2b2lk IFhTU0ZpbHRlcjo6ZmlsdGVyVG9rZW4oSFRNTFRva2VuJiB0b2tlbikKICAgICBBU1NFUlRfVU5V U0VEKHRva2VuLCAmdG9rZW4pOwogICAgIHJldHVybjsKICNlbHNlCisgICAgc3dpdGNoIChtX3N0 YXRlKSB7CisgICAgY2FzZSBJbml0aWFsOiAKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBBZnRl clNjcmlwdFN0YXJ0VGFnOgorICAgICAgICBmaWx0ZXJUb2tlbkFmdGVyU2NyaXB0U3RhcnRUYWco dG9rZW4pOworICAgICAgICBBU1NFUlQobV9zdGF0ZSA9PSBJbml0aWFsKTsKKyAgICAgICAgbV9j YWNoZWRTbmlwcGV0ID0gU3RyaW5nKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBp ZiAodG9rZW4udHlwZSgpICE9IEhUTUxUb2tlbjo6U3RhcnRUYWcpCiAgICAgICAgIHJldHVybjsK IAotICAgIEhUTUxUb2tlbjo6QXR0cmlidXRlTGlzdDo6Y29uc3RfaXRlcmF0b3IgaXRlciA9IHRv a2VuLmF0dHJpYnV0ZXMoKS5iZWdpbigpOwotICAgIGZvciAoOyBpdGVyICE9IHRva2VuLmF0dHJp YnV0ZXMoKS5lbmQoKTsgKytpdGVyKSB7Ci0gICAgICAgIGlmICghaXNOYW1lT2ZTY3JpcHRDYXJy eWluZ0F0dHJpYnV0ZShpdGVyLT5tX25hbWUpKQorICAgIGlmIChoYXNOYW1lKHRva2VuLCBzY3Jp cHRUYWcpKSB7CisgICAgICAgIGZpbHRlclNjcmlwdFRva2VuKHRva2VuKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdG9rZW4uYXR0cmlidXRl cygpLnNpemUoKTsgKytpKSB7CisgICAgICAgIGNvbnN0IEhUTUxUb2tlbjo6QXR0cmlidXRlJiBh dHRyaWJ1dGUgPSB0b2tlbi5hdHRyaWJ1dGVzKCkuYXQoaSk7CisgICAgICAgIGlmICghaXNOYW1l T2ZTY3JpcHRDYXJyeWluZ0F0dHJpYnV0ZShhdHRyaWJ1dGUubV9uYW1lKSkKICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICBpZiAoIWlzQ29udGFpbmVkSW5SZXF1ZXN0KHNuaXBwZXRGb3JB dHRyaWJ1dGUodG9rZW4sICppdGVyKSkpCisgICAgICAgIGlmICghaXNDb250YWluZWRJblJlcXVl c3Qoc25pcHBldEZvckF0dHJpYnV0ZSh0b2tlbiwgYXR0cmlidXRlKSkpCiAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgaXRlci0+bV92YWx1ZS5jbGVhcigpOworICAgICAgICB0b2tlbi5l cmFzZVZhbHVlT2ZBdHRyaWJ1dGUoaSk7CiAgICAgfQogI2VuZGlmCiB9CiAKK3ZvaWQgWFNTRmls dGVyOjpmaWx0ZXJUb2tlbkFmdGVyU2NyaXB0U3RhcnRUYWcoSFRNTFRva2VuJiB0b2tlbikKK3sK KyAgICBBU1NFUlQobV9zdGF0ZSA9PSBBZnRlclNjcmlwdFN0YXJ0VGFnKTsKKyAgICBtX3N0YXRl ID0gSW5pdGlhbDsKKworICAgIGlmICh0b2tlbi50eXBlKCkgIT0gSFRNTFRva2VuOjpDaGFyYWN0 ZXIpIHsKKyAgICAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OkVuZFRhZyB8 fCB0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpFbmRPZkZpbGUpOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaW50IHN0YXJ0ID0gMDsKKyAgICAvLyBGSVhNRTogV2UgcHJvYmFibHkg d2FudCB0byBncmFiIG9ubHkgdGhlIGZpcnN0IGZldyBjaGFyYWN0ZXJzIG9mIHRoZQorICAgIC8v ICAgICAgICBjb250ZW50cyBvZiB0aGUgc2NyaXB0IGVsZW1lbnQuCisgICAgaW50IGVuZCA9IHRv a2VuLmVuZEluZGV4KCkgLSB0b2tlbi5zdGFydEluZGV4KCk7CisgICAgaWYgKGlzQ29udGFpbmVk SW5SZXF1ZXN0KG1fY2FjaGVkU25pcHBldCArIHNuaXBwZXRGb3JSYW5nZSh0b2tlbiwgc3RhcnQs IGVuZCkpKSB7CisgICAgICAgIHRva2VuLmVyYXNlQ2hhcmFjdGVycygpOworICAgICAgICB0b2tl bi5hcHBlbmRUb0NoYXJhY3RlcignICcpOyAvLyBUZWNobmljYWxseSwgY2hhcmFjdGVyIHRva2Vu cyBjYW4ndCBiZSBlbXB0eS4KKyAgICB9Cit9CisKK3ZvaWQgWFNTRmlsdGVyOjpmaWx0ZXJTY3Jp cHRUb2tlbihIVE1MVG9rZW4mIHRva2VuKQoreworICAgIEFTU0VSVChtX3N0YXRlID09IEluaXRp YWwpOworICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpTdGFydFRhZyk7Cisg ICAgQVNTRVJUKGhhc05hbWUodG9rZW4sIHNjcmlwdFRhZykpOworCisgICAgc2l6ZV90IGluZGV4 T2ZGaXJzdFNyY0F0dHJpYnV0ZTsKKyAgICBpZiAoZmluZEF0dHJpYnV0ZVdpdGhOYW1lKHRva2Vu LCBzcmNBdHRyLCBpbmRleE9mRmlyc3RTcmNBdHRyaWJ1dGUpKSB7CisgICAgICAgIGNvbnN0IEhU TUxUb2tlbjo6QXR0cmlidXRlJiBzcmNBdHRyaWJ1dGUgPSB0b2tlbi5hdHRyaWJ1dGVzKCkuYXQo aW5kZXhPZkZpcnN0U3JjQXR0cmlidXRlKTsKKyAgICAgICAgaWYgKGlzQ29udGFpbmVkSW5SZXF1 ZXN0KHNuaXBwZXRGb3JBdHRyaWJ1dGUodG9rZW4sIHNyY0F0dHJpYnV0ZSkpKQorICAgICAgICAg ICAgdG9rZW4uZXJhc2VWYWx1ZU9mQXR0cmlidXRlKGluZGV4T2ZGaXJzdFNyY0F0dHJpYnV0ZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX3N0YXRlID0gQWZ0ZXJTY3JpcHRTdGFy dFRhZzsKKyAgICBtX2NhY2hlZFNuaXBwZXQgPSBtX3BhcnNlci0+c291cmNlRm9yVG9rZW4odG9r ZW4pOworfQorCitTdHJpbmcgWFNTRmlsdGVyOjpzbmlwcGV0Rm9yUmFuZ2UoY29uc3QgSFRNTFRv a2VuJiB0b2tlbiwgaW50IHN0YXJ0LCBpbnQgZW5kKQoreworICAgIC8vIEZJWE1FOiBUaGVyZSdz IGFuIGV4dHJhIGFsbG9jYXRpb24gaGVyZSB0aGF0IHdlIGNvdWxkIHNhdmUgYnkKKyAgICAvLyAg ICAgICAgcGFzc2luZyB0aGUgcmFuZ2UgdG8gdGhlIHBhcnNlci4KKyAgICByZXR1cm4gbV9wYXJz ZXItPnNvdXJjZUZvclRva2VuKHRva2VuKS5zdWJzdHJpbmcoc3RhcnQsIGVuZCAtIHN0YXJ0KTsK K30KKwogU3RyaW5nIFhTU0ZpbHRlcjo6c25pcHBldEZvckF0dHJpYnV0ZShjb25zdCBIVE1MVG9r ZW4mIHRva2VuLCBjb25zdCBIVE1MVG9rZW46OkF0dHJpYnV0ZSYgYXR0cmlidXRlKQogewogICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgZ3JhYiBvbmUgY2hhcmFjdGVyIGJlZm9yZSB0aGUgbmFtZSBh bHNvLgogICAgIGludCBzdGFydCA9IGF0dHJpYnV0ZS5tX25hbWVSYW5nZS5tX3N0YXJ0IC0gdG9r ZW4uc3RhcnRJbmRleCgpOwogICAgIC8vIEZJWE1FOiBXZSBwcm9iYWJseSB3YW50IHRvIGdyYWIg b25seSB0aGUgZmlyc3QgZmV3IGNoYXJhY3RlcnMgb2YgdGhlIGF0dHJpYnV0ZSB2YWx1ZS4KICAg ICBpbnQgZW5kID0gYXR0cmlidXRlLm1fdmFsdWVSYW5nZS5tX2VuZCAtIHRva2VuLnN0YXJ0SW5k ZXgoKTsKLQotICAgIC8vIEZJWE1FOiBUaGVyZSdzIGFuIGV4dHJhIGFsbG9jYXRpb24gaGVyZSB0 aGF0IHdlIGNvdWxkIHNhdmUgYnkKLSAgICAvLyAgICAgICAgcGFzc2luZyB0aGUgcmFuZ2UgdG8g dGhlIHBhcnNlci4KLSAgICByZXR1cm4gbV9wYXJzZXItPnNvdXJjZUZvclRva2VuKHRva2VuKS5z dWJzdHJpbmcoc3RhcnQsIGVuZCAtIHN0YXJ0KTsKKyAgICByZXR1cm4gc25pcHBldEZvclJhbmdl KHRva2VuLCBzdGFydCwgZW5kKTsKIH0KIAogYm9vbCBYU1NGaWx0ZXI6OmlzQ29udGFpbmVkSW5S ZXF1ZXN0KGNvbnN0IFN0cmluZyYgc25pcHBldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL1hTU0ZpbHRlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNT RmlsdGVyLmgKaW5kZXggYmIyYzRhNDA5OTk2NTk0NWI0YTBlOGFlZjAyNTA5MzVhNmRiZDU0MC4u ODlhYzk1YTg0M2EzMTdkNWIyNjRlMDY3NzFhNjA3MzhhMTFkMmVkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTRmlsdGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvWFNTRmlsdGVyLmgKQEAgLTQwLDEwICs0MCwyMiBAQCBwdWJsaWM6CiAgICAg dm9pZCBmaWx0ZXJUb2tlbihIVE1MVG9rZW4mKTsKIAogcHJpdmF0ZToKKyAgICBlbnVtIFN0YXRl IHsKKyAgICAgICAgSW5pdGlhbCwKKyAgICAgICAgQWZ0ZXJTY3JpcHRTdGFydFRhZywKKyAgICB9 OworCisgICAgdm9pZCBmaWx0ZXJUb2tlbkFmdGVyU2NyaXB0U3RhcnRUYWcoSFRNTFRva2VuJik7 CisgICAgdm9pZCBmaWx0ZXJTY3JpcHRUb2tlbihIVE1MVG9rZW4mKTsKKworICAgIFN0cmluZyBz bmlwcGV0Rm9yUmFuZ2UoY29uc3QgSFRNTFRva2VuJiwgaW50IHN0YXJ0LCBpbnQgZW5kKTsKICAg ICBTdHJpbmcgc25pcHBldEZvckF0dHJpYnV0ZShjb25zdCBIVE1MVG9rZW4mLCBjb25zdCBIVE1M VG9rZW46OkF0dHJpYnV0ZSYpOworCiAgICAgYm9vbCBpc0NvbnRhaW5lZEluUmVxdWVzdChjb25z dCBTdHJpbmcmKTsKIAogICAgIEhUTUxEb2N1bWVudFBhcnNlciogbV9wYXJzZXI7CisgICAgU3Rh dGUgbV9zdGF0ZTsKKyAgICBTdHJpbmcgbV9jYWNoZWRTbmlwcGV0OwogfTsKIAogfQo=