60773 2011-05-13 09:08:11 -0700 Web Inspector: Fix SourceJavaScriptTokenizer keyword parsing 2011-05-16 03:51:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 403581 0 apavlov 2011-05-13 09:08:11 -0700 SourceJavaScriptTokenizer has two issues with keyword parsing: 1. Keywords are tested as "token in this._keywords", thus "__proto__" and all methods found on a generic objects (e.g. "toString" are considered to be keywords) 2. "true}" is parsed as a single "javascript-ident", since the yych = "}"; if (yych <= 0x7F)... check always fails (JavaScript does not define comparisons of strings vs. integers the way we need). 403604 1 93467 apavlov 2011-05-13 09:40:50 -0700 Created attachment 93467 [PATCH] Suggested fix 403691 2 93467 pfeldman 2011-05-13 11:23:55 -0700 Comment on attachment 93467 [PATCH] Suggested fix Could you a test for these cases into the existing tokenizer tests? Otherwise looks good. 404383 3 93628 apavlov 2011-05-16 02:39:08 -0700 Created attachment 93628 [PATCH] Test added 404402 4 93628 commit-queue 2011-05-16 03:51:21 -0700 Comment on attachment 93628 [PATCH] Test added Clearing flags on attachment: 93628 Committed r86554: <http://trac.webkit.org/changeset/86554> 404403 5 commit-queue 2011-05-16 03:51:26 -0700 All reviewed patches have been landed. Closing bug. 93467 2011-05-13 09:40:50 -0700 2011-05-16 02:39:08 -0700 [PATCH] Suggested fix jstokenize.patch text/plain 5012 apavlov Y29tbWl0IGFlOWVlMjc3MGY3ODBmYjEwOWI3ZmNlMjRmNzQzYmUwYmI3MWJkMDMKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBGcmkgTWF5IDEz IDIwOjEwOjI2IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzVjYTQ0Mi4uMzVj Y2EyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA1LTEzICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IFNvdXJjZUphdmFTY3Jp cHRUb2tlbml6ZXIga2V5d29yZCBwYXJzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MDc3MworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNv dXJjZUphdmFTY3JpcHRUb2tlbml6ZXIucHJvdG90eXBlLm5leHRUb2tlbik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLnJlMmpzOgorCiAy MDExLTA1LTAxICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAgPGhvbGdlckBtb2lqaS1tb2Jp bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUphdmFTY3JpcHRUb2tlbml6 ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUphdmFTY3Jp cHRUb2tlbml6ZXIuanMKaW5kZXggNTQ4Mzg0Ni4uMGVhZGE2ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlSmF2YVNjcmlw dFRva2VuaXplci5qcwpAQCAtMSw0ICsxLDQgQEAKLS8qIEdlbmVyYXRlZCBieSByZTJjIDAuMTMu NSBvbiBGcmkgTWF5ICA2IDEzOjU2OjEzIDIwMTEgKi8KKy8qIEdlbmVyYXRlZCBieSByZTJjIDAu MTMuNSBvbiBGcmkgTWF5IDEzIDIwOjAxOjEzIDIwMTEgKi8KIC8qCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCkBAIC0zOCw2ICszOCw3 IEBACiAvLyB8IHNlZCAnc3xbKl1jdXJzb3J8dGhpcy5fY2hhckF0KGN1cnNvcil8JyBcCiAvLyB8 IHNlZCAnc3x5eWNoID0gXCpcKFteO10qXCl8eXljaCA9IHRoaXMuX2NoYXJBdFwxfCcgXAogLy8g fCBzZWQgJ3N8eyBnb3RvQ2FzZSA9IFwoW147IGNvbnRpbnVlOyB9O10qXCl8eyBnb3RvQ2FzZSA9 IFwxOyBjb250aW51ZTsgfXwnIFwKKy8vIHwgc2VkICdzfHl5Y2ggPD0gXCgweFswLTlhLWZBLWZd K1wpfHl5Y2ggPD0gU3RyaW5nLmZyb21DaGFyQ29kZShcMSl8JyBcCiAvLyB8IHNlZCAnc3x1bnNp Z25lZFwgaW50fHZhcnwnIFwKIC8vIHwgc2VkICdzfHZhclwgeXljaHxjYXNlIDE6IGNhc2UgMTog dmFyIHl5Y2h8JwogCkBAIC0yNTEsNyArMjUyLDcgQEAgY2FzZSAyMDoKIGNhc2UgMjE6CiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIHZhciB0b2tlbiA9IHRoaXMuX2xpbmUuc3Vi c3RyaW5nKGN1cnNvck9uRW50ZXIsIGN1cnNvcik7Ci0gICAgICAgICAgICAgICAgICAgIGlmICh0 b2tlbiBpbiB0aGlzLl9rZXl3b3JkcykKKyAgICAgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2tl eXdvcmRzW3Rva2VuXSA9PT0gdHJ1ZSAmJiB0b2tlbiAhPT0gIl9fcHJvdG9fXyIpCiAgICAgICAg ICAgICAgICAgICAgICAgICB0aGlzLnRva2VuVHlwZSA9ICJqYXZhc2NyaXB0LWtleXdvcmQiOwog ICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLnRv a2VuVHlwZSA9ICJqYXZhc2NyaXB0LWlkZW50IjsKQEAgLTQ1NSw3ICs0NTYsNyBAQCBjYXNlIDUw OgogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGlmICh5eWNo IDw9ICdgJykgeyBnb3RvQ2FzZSA9IDIxOyBjb250aW51ZTsgfTsKICAgICAgICAgICAgICAgICAg ICAgaWYgKHl5Y2ggPD0gJ3onKSB7IGdvdG9DYXNlID0gNDk7IGNvbnRpbnVlOyB9OwotICAgICAg ICAgICAgICAgICAgICBpZiAoeXljaCA8PSAweDdGKSB7IGdvdG9DYXNlID0gMjE7IGNvbnRpbnVl OyB9OworICAgICAgICAgICAgICAgICAgICBpZiAoeXljaCA8PSBTdHJpbmcuZnJvbUNoYXJDb2Rl KDB4N0YpKSB7IGdvdG9DYXNlID0gMjE7IGNvbnRpbnVlOyB9OwogICAgICAgICAgICAgICAgICAg ICB7IGdvdG9DYXNlID0gNDk7IGNvbnRpbnVlOyB9OwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KQEAgLTExODMsNyArMTE4NCw3IEBAIGNhc2UgMTQyOgogICAgICAgICAgICAgdGhp cy5zZXRMZXhDb25kaXRpb24odGhpcy5fbGV4Q29uZGl0aW9ucy5ESVYpOwogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgICAgICB2YXIgdG9rZW4gPSB0aGlzLl9saW5lLnN1YnN0cmluZyhj dXJzb3JPbkVudGVyLCBjdXJzb3IpOwotICAgICAgICAgICAgICAgICAgICBpZiAodG9rZW4gaW4g dGhpcy5fa2V5d29yZHMpCisgICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLl9rZXl3b3Jkc1t0 b2tlbl0gPT09IHRydWUgJiYgdG9rZW4gIT09ICJfX3Byb3RvX18iKQogICAgICAgICAgICAgICAg ICAgICAgICAgdGhpcy50b2tlblR5cGUgPSAiamF2YXNjcmlwdC1rZXl3b3JkIjsKICAgICAgICAg ICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy50b2tlblR5cGUg PSAiamF2YXNjcmlwdC1pZGVudCI7CkBAIC0xNDAwLDcgKzE0MDEsNyBAQCBjYXNlIDE3MDoKICAg ICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBpZiAoeXljaCA8PSAn YCcpIHsgZ290b0Nhc2UgPSAxNDI7IGNvbnRpbnVlOyB9OwogICAgICAgICAgICAgICAgICAgICBp ZiAoeXljaCA8PSAneicpIHsgZ290b0Nhc2UgPSAxNjk7IGNvbnRpbnVlOyB9OwotICAgICAgICAg ICAgICAgICAgICBpZiAoeXljaCA8PSAweDdGKSB7IGdvdG9DYXNlID0gMTQyOyBjb250aW51ZTsg fTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHl5Y2ggPD0gU3RyaW5nLmZyb21DaGFyQ29kZSgw eDdGKSkgeyBnb3RvQ2FzZSA9IDE0MjsgY29udGludWU7IH07CiAgICAgICAgICAgICAgICAgICAg IHsgZ290b0Nhc2UgPSAxNjk7IGNvbnRpbnVlOyB9OwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlSmF2YVNjcmlwdFRva2VuaXplci5yZTJqcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlSmF2YVNjcmlwdFRva2VuaXplci5yZTJqcwppbmRleCAxMzYwNGUy Li5iYTY1NTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIucmUyanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLnJlMmpzCkBAIC0zMCwx MyArMzAsMTQgQEAKIAogLy8gR2VuZXJhdGUganMgZmlsZSBhcyBmb2xsb3dzOgogLy8KLS8vIHJl MmMgLWlzYyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlSmF2YVNjcmlwdFRva2Vu aXplci5yZTJqcyBcCisvLyByZTJjIC1pc2MgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLnJlMmpzIFwKIC8vIHwgc2VkICdzfF55eVwo W146XSpcKSpcOnxjYXNlIFwxOnwnIFwKIC8vIHwgc2VkICdzfFsqXWN1cnNvclsrXVsrXXx0aGlz Ll9jaGFyQXQoY3Vyc29yKyspfCcgXAogLy8gfCBzZWQgJ3N8W1sqXVsrXVsrXWN1cnNvcnx0aGlz Ll9jaGFyQXQoKytjdXJzb3IpfCcgXAogLy8gfCBzZWQgJ3N8WypdY3Vyc29yfHRoaXMuX2NoYXJB dChjdXJzb3IpfCcgXAogLy8gfCBzZWQgJ3N8eXljaCA9IFwqXChbXjtdKlwpfHl5Y2ggPSB0aGlz Ll9jaGFyQXRcMXwnIFwKIC8vIHwgc2VkICdzfGdvdG8gY2FzZSBcKFteO10qXCl8eyBnb3RvQ2Fz ZSA9IFwxOyBjb250aW51ZTsgfXwnIFwKKy8vIHwgc2VkICdzfHl5Y2ggPD0gXCgweFswLTlhLWZB LWZdKlwpfHl5Y2ggPD0gU3RyaW5nLmZyb21DaGFyQ29kZShcMSl8JyBcCiAvLyB8IHNlZCAnc3x1 bnNpZ25lZFwgaW50fHZhcnwnIFwKIC8vIHwgc2VkICdzfHZhclwgeXljaHxjYXNlIDE6IHZhciB5 eWNofCcKIApAQCAtMTY0LDcgKzE2NSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VKYXZhU2NyaXB0 VG9rZW5pemVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICA8RElWLE5PRElWPiBJZGVu dGlmaWVyID0+IERJVgogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgdmFy IHRva2VuID0gdGhpcy5fbGluZS5zdWJzdHJpbmcoY3Vyc29yT25FbnRlciwgY3Vyc29yKTsKLSAg ICAgICAgICAgICAgICAgICAgaWYgKHRva2VuIGluIHRoaXMuX2tleXdvcmRzKQorICAgICAgICAg ICAgICAgICAgICBpZiAodGhpcy5fa2V5d29yZHNbdG9rZW5dID09PSB0cnVlICYmIHRva2VuICE9 PSAiX19wcm90b19fIikKICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMudG9rZW5UeXBlID0g ImphdmFzY3JpcHQta2V5d29yZCI7CiAgICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAg ICAgICAgICAgICAgICAgIHRoaXMudG9rZW5UeXBlID0gImphdmFzY3JpcHQtaWRlbnQiOwo= 93628 2011-05-16 02:39:08 -0700 2011-05-16 03:51:21 -0700 [PATCH] Test added jstokenize.patch text/plain 6892 apavlov Y29tbWl0IDM4NjlkYzVkOWUwM2E2Y2MyMGQ0MjY3NWFkYzZiNjFlMGU1YWJiMzEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBGcmkgTWF5IDEz IDIwOjEwOjI2IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYmZmNmFkMS4uZTcwZWRiMCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA1LTE2ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IFNvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIg a2V5d29yZCBwYXJzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02MDc3MworCisgICAgICAgICogaW5zcGVjdG9yL3N5bnRheC1oaWdobGlnaHQtamF2 YXNjcmlwdC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3N5bnRheC1oaWdobGln aHQtamF2YXNjcmlwdC5odG1sOgorCiAyMDExLTA1LTEzICBDc2FiYSBPc3p0cm9nb27DoWMgIDxv c3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBVbnJldmlld2VkIGZpeCBhZnRlciByODYz NTcsIHI4NjM3NCwgcjg2Mzc2LiBTa2lwIGZhaWxpbmcgdGVzdHMuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3Ivc3ludGF4LWhpZ2hsaWdodC1qYXZhc2NyaXB0LWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zeW50YXgtaGlnaGxpZ2h0LWphdmFzY3JpcHQtZXhw ZWN0ZWQudHh0CmluZGV4IGZhYTZmM2YuLmYyYzQ3MjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9zeW50YXgtaGlnaGxpZ2h0LWphdmFzY3JpcHQtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9zeW50YXgtaGlnaGxpZ2h0LWphdmFzY3JpcHQtZXhwZWN0 ZWQudHh0CkBAIC0xNSw0ICsxNSw2IEBAIG9vJzs6IHdlYmtpdC1qYXZhc2NyaXB0LXN0cmluZyws d2Via2l0LWphdmFzY3JpcHQtc3RyaW5nLCoKIGZvby8qKgogLwogKi9mb286IHdlYmtpdC1qYXZh c2NyaXB0LWlkZW50LHdlYmtpdC1qYXZhc2NyaXB0LWNvbW1lbnQsLHdlYmtpdC1qYXZhc2NyaXB0 LWNvbW1lbnQsLHdlYmtpdC1qYXZhc2NyaXB0LWNvbW1lbnQsd2Via2l0LWphdmFzY3JpcHQtaWRl bnQKK3swOiB0cnVlfTogKix3ZWJraXQtamF2YXNjcmlwdC1udW1iZXIsKix3ZWJraXQtamF2YXNj cmlwdC1rZXl3b3JkLCoKK3ZhciB0b1N0cmluZzs6IHdlYmtpdC1qYXZhc2NyaXB0LWtleXdvcmQs Kix3ZWJraXQtamF2YXNjcmlwdC1pZGVudCwqCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9zeW50YXgtaGlnaGxpZ2h0LWphdmFzY3JpcHQuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9zeW50YXgtaGlnaGxpZ2h0LWphdmFzY3JpcHQuaHRtbAppbmRleCBjYjNlYzA1Li5k YWE1MTZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3ludGF4LWhpZ2hsaWdo dC1qYXZhc2NyaXB0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N5bnRheC1oaWdo bGlnaHQtamF2YXNjcmlwdC5odG1sCkBAIC0yMiw2ICsyMiw4IEBAIGZ1bmN0aW9uIHRlc3QoKQog ICAgIGR1bXBTeW50YXhIaWdobGlnaHRKUygiJ1xcZlxcYlxcdCc7Iik7CiAgICAgZHVtcFN5bnRh eEhpZ2hsaWdodEpTKCInL1xcXG4vJzsiKTsKICAgICBkdW1wU3ludGF4SGlnaGxpZ2h0SlMoImZv by8qKlxuL1xuKi9mb28iKTsKKyAgICBkdW1wU3ludGF4SGlnaGxpZ2h0SlMoInswOiB0cnVlfSIp OworICAgIGR1bXBTeW50YXhIaWdobGlnaHRKUygidmFyIHRvU3RyaW5nOyIpOwogCiAgICAgSW5z cGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNWNhNDQyLi4zODQ3 N2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDUtMTYgIEFsZXhhbmRlciBQ YXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggU291cmNlSmF2YVNjcmlw dFRva2VuaXplciBrZXl3b3JkIHBhcnNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwNzczCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlSmF2YVNjcmlwdFRva2VuaXplci5wcm90b3R5cGUubmV4dFRva2VuKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIucmUyanM6CisKIDIw MTEtMDUtMDEgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8aG9sZ2VyQG1vaWppLW1vYmls ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlSmF2YVNjcmlwdFRva2VuaXpl ci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlSmF2YVNjcmlw dFRva2VuaXplci5qcwppbmRleCA1NDgzODQ2Li4wZWFkYTZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0 VG9rZW5pemVyLmpzCkBAIC0xLDQgKzEsNCBAQAotLyogR2VuZXJhdGVkIGJ5IHJlMmMgMC4xMy41 IG9uIEZyaSBNYXkgIDYgMTM6NTY6MTMgMjAxMSAqLworLyogR2VuZXJhdGVkIGJ5IHJlMmMgMC4x My41IG9uIEZyaSBNYXkgMTMgMjA6MDE6MTMgMjAxMSAqLwogLyoKICAqIENvcHlyaWdodCAoQykg MjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTM4LDYgKzM4LDcg QEAKIC8vIHwgc2VkICdzfFsqXWN1cnNvcnx0aGlzLl9jaGFyQXQoY3Vyc29yKXwnIFwKIC8vIHwg c2VkICdzfHl5Y2ggPSBcKlwoW147XSpcKXx5eWNoID0gdGhpcy5fY2hhckF0XDF8JyBcCiAvLyB8 IHNlZCAnc3x7IGdvdG9DYXNlID0gXChbXjsgY29udGludWU7IH07XSpcKXx7IGdvdG9DYXNlID0g XDE7IGNvbnRpbnVlOyB9fCcgXAorLy8gfCBzZWQgJ3N8eXljaCA8PSBcKDB4WzAtOWEtZkEtZl0r XCl8eXljaCA8PSBTdHJpbmcuZnJvbUNoYXJDb2RlKFwxKXwnIFwKIC8vIHwgc2VkICdzfHVuc2ln bmVkXCBpbnR8dmFyfCcgXAogLy8gfCBzZWQgJ3N8dmFyXCB5eWNofGNhc2UgMTogY2FzZSAxOiB2 YXIgeXljaHwnCiAKQEAgLTI1MSw3ICsyNTIsNyBAQCBjYXNlIDIwOgogY2FzZSAyMToKICAgICAg ICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgdmFyIHRva2VuID0gdGhpcy5fbGluZS5zdWJz dHJpbmcoY3Vyc29yT25FbnRlciwgY3Vyc29yKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHRv a2VuIGluIHRoaXMuX2tleXdvcmRzKQorICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fa2V5 d29yZHNbdG9rZW5dID09PSB0cnVlICYmIHRva2VuICE9PSAiX19wcm90b19fIikKICAgICAgICAg ICAgICAgICAgICAgICAgIHRoaXMudG9rZW5UeXBlID0gImphdmFzY3JpcHQta2V5d29yZCI7CiAg ICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMudG9r ZW5UeXBlID0gImphdmFzY3JpcHQtaWRlbnQiOwpAQCAtNDU1LDcgKzQ1Niw3IEBAIGNhc2UgNTA6 CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHl5Y2gg PD0gJ2AnKSB7IGdvdG9DYXNlID0gMjE7IGNvbnRpbnVlOyB9OwogICAgICAgICAgICAgICAgICAg ICBpZiAoeXljaCA8PSAneicpIHsgZ290b0Nhc2UgPSA0OTsgY29udGludWU7IH07Ci0gICAgICAg ICAgICAgICAgICAgIGlmICh5eWNoIDw9IDB4N0YpIHsgZ290b0Nhc2UgPSAyMTsgY29udGludWU7 IH07CisgICAgICAgICAgICAgICAgICAgIGlmICh5eWNoIDw9IFN0cmluZy5mcm9tQ2hhckNvZGUo MHg3RikpIHsgZ290b0Nhc2UgPSAyMTsgY29udGludWU7IH07CiAgICAgICAgICAgICAgICAgICAg IHsgZ290b0Nhc2UgPSA0OTsgY29udGludWU7IH07CiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQpAQCAtMTE4Myw3ICsxMTg0LDcgQEAgY2FzZSAxNDI6CiAgICAgICAgICAgICB0aGlz LnNldExleENvbmRpdGlvbih0aGlzLl9sZXhDb25kaXRpb25zLkRJVik7CiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgICAgIHZhciB0b2tlbiA9IHRoaXMuX2xpbmUuc3Vic3RyaW5nKGN1 cnNvck9uRW50ZXIsIGN1cnNvcik7Ci0gICAgICAgICAgICAgICAgICAgIGlmICh0b2tlbiBpbiB0 aGlzLl9rZXl3b3JkcykKKyAgICAgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2tleXdvcmRzW3Rv a2VuXSA9PT0gdHJ1ZSAmJiB0b2tlbiAhPT0gIl9fcHJvdG9fXyIpCiAgICAgICAgICAgICAgICAg ICAgICAgICB0aGlzLnRva2VuVHlwZSA9ICJqYXZhc2NyaXB0LWtleXdvcmQiOwogICAgICAgICAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLnRva2VuVHlwZSA9 ICJqYXZhc2NyaXB0LWlkZW50IjsKQEAgLTE0MDAsNyArMTQwMSw3IEBAIGNhc2UgMTcwOgogICAg ICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIGlmICh5eWNoIDw9ICdg JykgeyBnb3RvQ2FzZSA9IDE0MjsgY29udGludWU7IH07CiAgICAgICAgICAgICAgICAgICAgIGlm ICh5eWNoIDw9ICd6JykgeyBnb3RvQ2FzZSA9IDE2OTsgY29udGludWU7IH07Ci0gICAgICAgICAg ICAgICAgICAgIGlmICh5eWNoIDw9IDB4N0YpIHsgZ290b0Nhc2UgPSAxNDI7IGNvbnRpbnVlOyB9 OworICAgICAgICAgICAgICAgICAgICBpZiAoeXljaCA8PSBTdHJpbmcuZnJvbUNoYXJDb2RlKDB4 N0YpKSB7IGdvdG9DYXNlID0gMTQyOyBjb250aW51ZTsgfTsKICAgICAgICAgICAgICAgICAgICAg eyBnb3RvQ2FzZSA9IDE2OTsgY29udGludWU7IH07CiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T b3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLnJlMmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLnJlMmpzCmluZGV4IDEzNjA0ZTIu LmJhNjU1NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlSmF2YVNjcmlwdFRva2VuaXplci5yZTJqcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIucmUyanMKQEAgLTMwLDEz ICszMCwxNCBAQAogCiAvLyBHZW5lcmF0ZSBqcyBmaWxlIGFzIGZvbGxvd3M6CiAvLwotLy8gcmUy YyAtaXNjIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VKYXZhU2NyaXB0VG9rZW5p emVyLnJlMmpzIFwKKy8vIHJlMmMgLWlzYyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZUphdmFTY3JpcHRUb2tlbml6ZXIucmUyanMgXAogLy8gfCBzZWQgJ3N8Xnl5XChb XjpdKlwpKlw6fGNhc2UgXDE6fCcgXAogLy8gfCBzZWQgJ3N8WypdY3Vyc29yWytdWytdfHRoaXMu X2NoYXJBdChjdXJzb3IrKyl8JyBcCiAvLyB8IHNlZCAnc3xbWypdWytdWytdY3Vyc29yfHRoaXMu X2NoYXJBdCgrK2N1cnNvcil8JyBcCiAvLyB8IHNlZCAnc3xbKl1jdXJzb3J8dGhpcy5fY2hhckF0 KGN1cnNvcil8JyBcCiAvLyB8IHNlZCAnc3x5eWNoID0gXCpcKFteO10qXCl8eXljaCA9IHRoaXMu X2NoYXJBdFwxfCcgXAogLy8gfCBzZWQgJ3N8Z290byBjYXNlIFwoW147XSpcKXx7IGdvdG9DYXNl ID0gXDE7IGNvbnRpbnVlOyB9fCcgXAorLy8gfCBzZWQgJ3N8eXljaCA8PSBcKDB4WzAtOWEtZkEt Zl0qXCl8eXljaCA8PSBTdHJpbmcuZnJvbUNoYXJDb2RlKFwxKXwnIFwKIC8vIHwgc2VkICdzfHVu c2lnbmVkXCBpbnR8dmFyfCcgXAogLy8gfCBzZWQgJ3N8dmFyXCB5eWNofGNhc2UgMTogdmFyIHl5 Y2h8JwogCkBAIC0xNjQsNyArMTY1LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUphdmFTY3JpcHRU b2tlbml6ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIDxESVYsTk9ESVY+IElkZW50 aWZpZXIgPT4gRElWCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICB2YXIg dG9rZW4gPSB0aGlzLl9saW5lLnN1YnN0cmluZyhjdXJzb3JPbkVudGVyLCBjdXJzb3IpOwotICAg ICAgICAgICAgICAgICAgICBpZiAodG9rZW4gaW4gdGhpcy5fa2V5d29yZHMpCisgICAgICAgICAg ICAgICAgICAgIGlmICh0aGlzLl9rZXl3b3Jkc1t0b2tlbl0gPT09IHRydWUgJiYgdG9rZW4gIT09 ICJfX3Byb3RvX18iKQogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy50b2tlblR5cGUgPSAi amF2YXNjcmlwdC1rZXl3b3JkIjsKICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICAgICAgdGhpcy50b2tlblR5cGUgPSAiamF2YXNjcmlwdC1pZGVudCI7Cg==