41434 2010-06-30 16:13:40 -0700 HTMLTokenizer's whitespace checks are very redundant 2010-07-01 00:06:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth abarth commit-queue eric webkit.review.bot oldest_to_newest 244990 0 abarth 2010-06-30 16:13:40 -0700 HTMLTokenizer's whitespace checks are very redundant 244992 1 60165 abarth 2010-06-30 16:14:41 -0700 Created attachment 60165 Patch 244994 2 60165 eric 2010-06-30 16:16:00 -0700 Comment on attachment 60165 Patch Yay! 245125 3 60165 commit-queue 2010-06-30 23:22:45 -0700 Comment on attachment 60165 Patch Clearing flags on attachment: 60165 Committed r62229: <http://trac.webkit.org/changeset/62229> 245126 4 commit-queue 2010-06-30 23:22:50 -0700 All reviewed patches have been landed. Closing bug. 245146 5 webkit.review.bot 2010-07-01 00:06:01 -0700 http://trac.webkit.org/changeset/62229 might have broken GTK Linux 32-bit Release 60165 2010-06-30 16:14:41 -0700 2010-06-30 23:22:45 -0700 Patch bug-41434-20100630161440.patch text/plain 12377 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTlhNTM0ZGNkNDEwNGJiMDc5ZjFkOGUwNThiYmY1YzM4NzJiYzEwOS4uNGJlMjI1OGYzMmEwMGZj NTcyN2U2Mjc0MDQxNjlkOTk5YmExNDQ0NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNi0zMCAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEhUTUxUb2tlbml6ZXIncyB3aGl0ZXNwYWNlIGNoZWNrcyBh cmUgdmVyeSByZWR1bmRhbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQxNDM0CisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGlzVG9rZW5pemVyV2hp dGVzcGFjZSwgd2hpY2ggcmVwbGFjZXMgYSBsb3Qgb2YKKyAgICAgICAgcmVkdW5kYW50IGxvZ2lj IGluIG5leHRUb2tlbi4KKworICAgICAgICAqIGh0bWwvSFRNTFRva2VuaXplci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4pOgorCiAyMDEwLTA2LTMwICBY YW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0 YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAg Yi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKaW5kZXggNjZlZTU5ZjcwMTc0ZDIzMWVi OTk2NWE5OTc0MzBlMmE2ZWIzZTM2OS4uNjhkYzRkYjVkMGM0NzZkNTliMjZiZGZhYjcyYTFiZTA4 ZTM4YTI5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCisrKyBi L1dlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcApAQCAtNTUsNiArNTUsMTEgQEAgaW5saW5l IFVDaGFyIHRvTG93ZXJDYXNlKFVDaGFyIGNjKQogICAgIHJldHVybiBjYyArIGxvd2VyQ2FzZU9m ZnNldDsKIH0KIAoraW5saW5lIGJvb2wgaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKFVDaGFyIGNjKQor eworICAgIHJldHVybiBjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBD JyB8fCBjYyA9PSAnICc7Cit9CisKIGlubGluZSB2b2lkIGFkdmFuY2VTdHJpbmdBbmRBU1NFUlRJ Z25vcmluZ0Nhc2UoU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIGNvbnN0IGNoYXIqIGV4cGVjdGVk Q2hhcmFjdGVycykKIHsKICAgICB3aGlsZSAoKmV4cGVjdGVkQ2hhcmFjdGVycykKQEAgLTQwMiw3 ICs0MDcsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcm IHNvdXJjZSwgSFRNTFRva2VuJiB0b2tlbikKICAgICBFTkRfU1RBVEUoKQogCiAgICAgQkVHSU5f U1RBVEUoVGFnTmFtZVN0YXRlKSB7Ci0gICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwgY2MgPT0g J1x4MEEnIHx8IGNjID09ICdceDBDJyB8fCBjYyA9PSAnICcpCisgICAgICAgIGlmIChpc1Rva2Vu aXplcldoaXRlc3BhY2UoY2MpKQogICAgICAgICAgICAgQURWQU5DRV9UTyhCZWZvcmVBdHRyaWJ1 dGVOYW1lU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnLycpCiAgICAgICAgICAgICBB RFZBTkNFX1RPKFNlbGZDbG9zaW5nU3RhcnRUYWdTdGF0ZSk7CkBAIC00NjAsNyArNDY1LDcgQEAg Ym9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBhZGRUb1Bvc3NpYmxlRW5kVGFnKGNjKTsKICAg ICAgICAgICAgIEFEVkFOQ0VfVE8oUkNEQVRBRW5kVGFnTmFtZVN0YXRlKTsKICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNj ID09ICdceDBDJyB8fCBjYyA9PSAnICcpIHsKKyAgICAgICAgICAgIGlmIChpc1Rva2VuaXplcldo aXRlc3BhY2UoY2MpKSB7CiAgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWco KSkKICAgICAgICAgICAgICAgICAgICAgRkxVU0hfQU5EX0FEVkFOQ0VfVE8oQmVmb3JlQXR0cmli dXRlTmFtZVN0YXRlKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJy8nKSB7CkBAIC01 MTgsNyArNTIzLDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3Ry aW5nJiBzb3VyY2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBhZGRUb1Bvc3NpYmxl RW5kVGFnKGNjKTsKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oUkFXVEVYVEVuZFRhZ05hbWVTdGF0 ZSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoY2MgPT0gJ1x4MDknIHx8IGNj ID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKSB7CisgICAgICAgICAgICBp ZiAoaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNjKSkgewogICAgICAgICAgICAgICAgIGlmIChpc0Fw cHJvcHJpYXRlRW5kVGFnKCkpCiAgICAgICAgICAgICAgICAgICAgIEZMVVNIX0FORF9BRFZBTkNF X1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGNj ID09ICcvJykgewpAQCAtNTgwLDcgKzU4NSw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRv a2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAg ICAgYWRkVG9Qb3NzaWJsZUVuZFRhZyhjYyk7CiAgICAgICAgICAgICBBRFZBTkNFX1RPKFNjcmlw dERhdGFFbmRUYWdOYW1lU3RhdGUpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYg KGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcg JykgeworICAgICAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKICAgICAg ICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKQogICAgICAgICAgICAgICAgICAg ICBGTFVTSF9BTkRfQURWQU5DRV9UTyhCZWZvcmVBdHRyaWJ1dGVOYW1lU3RhdGUpOwogICAgICAg ICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLycpIHsKQEAgLTcxOSw3ICs3MjQsNyBAQCBib29sIEhU TUxUb2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTFRva2Vu JiB0b2tlbikKICAgICAgICAgICAgIGFkZFRvUG9zc2libGVFbmRUYWcoY2MpOwogICAgICAgICAg ICAgQURWQU5DRV9UTyhTY3JpcHREYXRhRXNjYXBlZEVuZFRhZ05hbWVTdGF0ZSk7CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAoY2MgPT0gJ1x4MDknIHx8IGNjID09ICdceDBBJyB8 fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKSB7CisgICAgICAgICAgICBpZiAoaXNUb2tlbml6 ZXJXaGl0ZXNwYWNlKGNjKSkgewogICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRlRW5k VGFnKCkpCiAgICAgICAgICAgICAgICAgICAgIEZMVVNIX0FORF9BRFZBTkNFX1RPKEJlZm9yZUF0 dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGNjID09ICcvJykgewpA QCAtNzM5LDcgKzc0NCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRl ZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAKICAg ICBCRUdJTl9TVEFURShTY3JpcHREYXRhRG91YmxlRXNjYXBlU3RhcnRTdGF0ZSkgewotICAgICAg ICBpZiAoY2MgPT0gJ1x4MDknIHx8IGNjID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2Mg PT0gJyAnIHx8IGNjID09ICcvJyB8fCBjYyA9PSAnPicpIHsKKyAgICAgICAgaWYgKGlzVG9rZW5p emVyV2hpdGVzcGFjZShjYykgfHwgY2MgPT0gJy8nIHx8IGNjID09ICc+JykgewogICAgICAgICAg ICAgYnVmZmVyQ2hhcmFjdGVyKGNjKTsKICAgICAgICAgICAgIGlmICh0ZW1wb3JhcnlCdWZmZXJJ cyhzY3JpcHRUYWcubG9jYWxOYW1lKCkpKQogICAgICAgICAgICAgICAgIEFEVkFOQ0VfVE8oU2Ny aXB0RGF0YURvdWJsZUVzY2FwZWRTdGF0ZSk7CkBAIC04MjMsNyArODI4LDcgQEAgYm9vbCBIVE1M VG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUxUb2tlbiYg dG9rZW4pCiAgICAgRU5EX1NUQVRFKCkKIAogICAgIEJFR0lOX1NUQVRFKFNjcmlwdERhdGFEb3Vi bGVFc2NhcGVFbmRTdGF0ZSkgewotICAgICAgICBpZiAoY2MgPT0gJ1x4MDknIHx8IGNjID09ICdc eDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnIHx8IGNjID09ICcvJyB8fCBjYyA9PSAn PicpIHsKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykgfHwgY2MgPT0gJy8n IHx8IGNjID09ICc+JykgewogICAgICAgICAgICAgYnVmZmVyQ2hhcmFjdGVyKGNjKTsKICAgICAg ICAgICAgIGlmICh0ZW1wb3JhcnlCdWZmZXJJcyhzY3JpcHRUYWcubG9jYWxOYW1lKCkpKQogICAg ICAgICAgICAgICAgIEFEVkFOQ0VfVE8oU2NyaXB0RGF0YUVzY2FwZWRTdGF0ZSk7CkBAIC04NDMs NyArODQ4LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5n JiBzb3VyY2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgRU5EX1NUQVRFKCkKIAogICAgIEJFR0lO X1NUQVRFKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSkgewotICAgICAgICBpZiAoY2MgPT0gJ1x4 MDknIHx8IGNjID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKQorICAgICAg ICBpZiAoaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNjKSkKICAgICAgICAgICAgIEFEVkFOQ0VfVE8o QmVmb3JlQXR0cmlidXRlTmFtZVN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJy8nKQog ICAgICAgICAgICAgQURWQU5DRV9UTyhTZWxmQ2xvc2luZ1N0YXJ0VGFnU3RhdGUpOwpAQCAtODY3 LDcgKzg3Miw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmlu ZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAKICAgICBCRUdJ Tl9TVEFURShBdHRyaWJ1dGVOYW1lU3RhdGUpIHsKLSAgICAgICAgaWYgKGNjID09ICdceDA5JyB8 fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykKKyAgICAgICAgaWYg KGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEFmdGVy QXR0cmlidXRlTmFtZVN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJy8nKQogICAgICAg ICAgICAgQURWQU5DRV9UTyhTZWxmQ2xvc2luZ1N0YXJ0VGFnU3RhdGUpOwpAQCAtODkxLDcgKzg5 Niw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291 cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFU RShBZnRlckF0dHJpYnV0ZU5hbWVTdGF0ZSkgewotICAgICAgICBpZiAoY2MgPT0gJ1x4MDknIHx8 IGNjID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKQorICAgICAgICBpZiAo aXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNjKSkKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oQWZ0ZXJB dHRyaWJ1dGVOYW1lU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnLycpCiAgICAgICAg ICAgICBBRFZBTkNFX1RPKFNlbGZDbG9zaW5nU3RhcnRUYWdTdGF0ZSk7CkBAIC05MTcsNyArOTIy LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3Vy Y2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgRU5EX1NUQVRFKCkKIAogICAgIEJFR0lOX1NUQVRF KEJlZm9yZUF0dHJpYnV0ZVZhbHVlU3RhdGUpIHsKLSAgICAgICAgaWYgKGNjID09ICdceDA5JyB8 fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykKKyAgICAgICAgaWYg KGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEJlZm9y ZUF0dHJpYnV0ZVZhbHVlU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnIicpCiAgICAg ICAgICAgICBBRFZBTkNFX1RPKEF0dHJpYnV0ZVZhbHVlRG91YmxlUXVvdGVkU3RhdGUpOwpAQCAt OTczLDcgKzk3OCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0 cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAKICAgICBC RUdJTl9TVEFURShBdHRyaWJ1dGVWYWx1ZVVucXVvdGVkU3RhdGUpIHsKLSAgICAgICAgaWYgKGNj ID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykK KyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAgICAgICBBRFZB TkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAgICAgIGVsc2UgaWYgKGNjID09 ICcmJykgewogICAgICAgICAgICAgbV9hZGRpdGlvbmFsQWxsb3dlZENoYXJhY3RlciA9ICc+JzsK QEAgLTEwMjEsNyArMTAyNiw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21l bnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAK ICAgICBCRUdJTl9TVEFURShBZnRlckF0dHJpYnV0ZVZhbHVlUXVvdGVkU3RhdGUpIHsKLSAgICAg ICAgaWYgKGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNj ID09ICcgJykKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAg ICAgICBBRFZBTkNFX1RPKEJlZm9yZUF0dHJpYnV0ZU5hbWVTdGF0ZSk7CiAgICAgICAgIGVsc2Ug aWYgKGNjID09ICcvJykKICAgICAgICAgICAgIEFEVkFOQ0VfVE8oU2VsZkNsb3NpbmdTdGFydFRh Z1N0YXRlKTsKQEAgLTExNjEsNyArMTE2Niw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRv a2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEJFR0lO X1NUQVRFKENvbW1lbnRFbmRTdGF0ZSkgewogICAgICAgICBpZiAoY2MgPT0gJz4nKQogICAgICAg ICAgICAgcmV0dXJuIGVtaXRBbmRSZXN1bWVJbihzb3VyY2UsIERhdGFTdGF0ZSk7Ci0gICAgICAg IGVsc2UgaWYgKGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8 IGNjID09ICcgJykgeworICAgICAgICBlbHNlIGlmIChpc1Rva2VuaXplcldoaXRlc3BhY2UoY2Mp KSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKCk7CiAgICAgICAgICAgICBtX3Rva2VuLT5hcHBl bmRUb0NvbW1lbnQoJy0nKTsKICAgICAgICAgICAgIG1fdG9rZW4tPmFwcGVuZFRvQ29tbWVudCgn LScpOwpAQCAtMTIxMCw3ICsxMjE1LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4o U2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgRU5EX1NUQVRF KCkKIAogICAgIEJFR0lOX1NUQVRFKENvbW1lbnRFbmRTcGFjZVN0YXRlKSB7Ci0gICAgICAgIGlm IChjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBDJyB8fCBjYyA9PSAn ICcpIHsKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpIHsKICAgICAgICAg ICAgIG1fdG9rZW4tPmFwcGVuZFRvQ29tbWVudChjYyk7CiAgICAgICAgICAgICBBRFZBTkNFX1RP KENvbW1lbnRFbmRTcGFjZVN0YXRlKTsKICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnLScpCkBA IC0xMjI4LDcgKzEyMzMsNyBAQCBib29sIEhUTUxUb2tlbml6ZXI6Om5leHRUb2tlbihTZWdtZW50 ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTFRva2VuJiB0b2tlbikKICAgICBFTkRfU1RBVEUoKQogCiAg ICAgQkVHSU5fU1RBVEUoRE9DVFlQRVN0YXRlKSB7Ci0gICAgICAgIGlmIChjYyA9PSAnXHgwOScg fHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBDJyB8fCBjYyA9PSAnICcpCisgICAgICAgIGlm IChpc1Rva2VuaXplcldoaXRlc3BhY2UoY2MpKQogICAgICAgICAgICAgQURWQU5DRV9UTyhCZWZv cmVET0NUWVBFTmFtZVN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gSW5wdXRTdHJlYW1Q cmVwcm9jZXNzb3I6OmVuZE9mRmlsZU1hcmtlcikgewogICAgICAgICAgICAgcGFyc2VFcnJvcigp OwpAQCAtMTI0Myw3ICsxMjQ4LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2Vn bWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgRU5EX1NUQVRFKCkK IAogICAgIEJFR0lOX1NUQVRFKEJlZm9yZURPQ1RZUEVOYW1lU3RhdGUpIHsKLSAgICAgICAgaWYg KGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcg JykKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAgICAgICBB RFZBTkNFX1RPKEJlZm9yZURPQ1RZUEVOYW1lU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA+ PSAnQScgJiYgY2MgPD0gJ1onKSB7CiAgICAgICAgICAgICBtX3Rva2VuLT5iZWdpbkRPQ1RZUEUo dG9Mb3dlckNhc2UoY2MpKTsKQEAgLTEyNjYsNyArMTI3MSw3IEBAIGJvb2wgSFRNTFRva2VuaXpl cjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQog ICAgIEVORF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShET0NUWVBFTmFtZVN0YXRlKSB7Ci0g ICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBDJyB8 fCBjYyA9PSAnICcpCisgICAgICAgIGlmIChpc1Rva2VuaXplcldoaXRlc3BhY2UoY2MpKQogICAg ICAgICAgICAgQURWQU5DRV9UTyhBZnRlckRPQ1RZUEVOYW1lU3RhdGUpOwogICAgICAgICBlbHNl IGlmIChjYyA9PSAnPicpCiAgICAgICAgICAgICByZXR1cm4gZW1pdEFuZFJlc3VtZUluKHNvdXJj ZSwgRGF0YVN0YXRlKTsKQEAgLTEyODUsNyArMTI5MCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6 bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAg IEVORF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShBZnRlckRPQ1RZUEVOYW1lU3RhdGUpIHsK LSAgICAgICAgaWYgKGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMn IHx8IGNjID09ICcgJykKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAg ICAgICAgICAgICBBRFZBTkNFX1RPKEFmdGVyRE9DVFlQRU5hbWVTdGF0ZSk7CiAgICAgICAgIGlm IChjYyA9PSAnPicpCiAgICAgICAgICAgICByZXR1cm4gZW1pdEFuZFJlc3VtZUluKHNvdXJjZSwg RGF0YVN0YXRlKTsKQEAgLTEzMTksNyArMTMyNCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4 dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVO RF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShBZnRlckRPQ1RZUEVQdWJsaWNLZXl3b3JkU3Rh dGUpIHsKLSAgICAgICAgaWYgKGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0g J1x4MEMnIHx8IGNjID09ICcgJykKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShj YykpCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEJlZm9yZURPQ1RZUEVQdWJsaWNJZGVudGlmaWVy U3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnIicpIHsKICAgICAgICAgICAgIHBhcnNl RXJyb3IoKTsKQEAgLTEzNDYsNyArMTM1MSw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRv a2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9T VEFURSgpCiAKICAgICBCRUdJTl9TVEFURShCZWZvcmVET0NUWVBFUHVibGljSWRlbnRpZmllclN0 YXRlKSB7Ci0gICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09 ICdceDBDJyB8fCBjYyA9PSAnICcpCisgICAgICAgIGlmIChpc1Rva2VuaXplcldoaXRlc3BhY2Uo Y2MpKQogICAgICAgICAgICAgQURWQU5DRV9UTyhCZWZvcmVET0NUWVBFUHVibGljSWRlbnRpZmll clN0YXRlKTsKICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJyInKSB7CiAgICAgICAgICAgICBtX3Rv a2VuLT5zZXRQdWJsaWNJZGVudGlmaWVyVG9FbXB0eVN0cmluZygpOwpAQCAtMTQwNyw3ICsxNDEy LDcgQEAgYm9vbCBIVE1MVG9rZW5pemVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3Vy Y2UsIEhUTUxUb2tlbiYgdG9rZW4pCiAgICAgRU5EX1NUQVRFKCkKIAogICAgIEJFR0lOX1NUQVRF KEFmdGVyRE9DVFlQRVB1YmxpY0lkZW50aWZpZXJTdGF0ZSkgewotICAgICAgICBpZiAoY2MgPT0g J1x4MDknIHx8IGNjID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKQorICAg ICAgICBpZiAoaXNUb2tlbml6ZXJXaGl0ZXNwYWNlKGNjKSkKICAgICAgICAgICAgIEFEVkFOQ0Vf VE8oQmV0d2VlbkRPQ1RZUEVQdWJsaWNBbmRTeXN0ZW1JZGVudGlmaWVyc1N0YXRlKTsKICAgICAg ICAgZWxzZSBpZiAoY2MgPT0gJz4nKQogICAgICAgICAgICAgcmV0dXJuIGVtaXRBbmRSZXN1bWVJ bihzb3VyY2UsIERhdGFTdGF0ZSk7CkBAIC0xNDMyLDcgKzE0MzcsNyBAQCBib29sIEhUTUxUb2tl bml6ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTFRva2VuJiB0b2tl bikKICAgICBFTkRfU1RBVEUoKQogCiAgICAgQkVHSU5fU1RBVEUoQmV0d2VlbkRPQ1RZUEVQdWJs aWNBbmRTeXN0ZW1JZGVudGlmaWVyc1N0YXRlKSB7Ci0gICAgICAgIGlmIChjYyA9PSAnXHgwOScg fHwgY2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBDJyB8fCBjYyA9PSAnICcpCisgICAgICAgIGlm IChpc1Rva2VuaXplcldoaXRlc3BhY2UoY2MpKQogICAgICAgICAgICAgQURWQU5DRV9UTyhCZXR3 ZWVuRE9DVFlQRVB1YmxpY0FuZFN5c3RlbUlkZW50aWZpZXJzU3RhdGUpOwogICAgICAgICBlbHNl IGlmIChjYyA9PSAnPicpCiAgICAgICAgICAgICByZXR1cm4gZW1pdEFuZFJlc3VtZUluKHNvdXJj ZSwgRGF0YVN0YXRlKTsKQEAgLTE0NTUsNyArMTQ2MCw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6 bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAg IEVORF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShBZnRlckRPQ1RZUEVTeXN0ZW1LZXl3b3Jk U3RhdGUpIHsKLSAgICAgICAgaWYgKGNjID09ICdceDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2Mg PT0gJ1x4MEMnIHx8IGNjID09ICcgJykKKyAgICAgICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFj ZShjYykpCiAgICAgICAgICAgICBBRFZBTkNFX1RPKEJlZm9yZURPQ1RZUEVTeXN0ZW1JZGVudGlm aWVyU3RhdGUpOwogICAgICAgICBlbHNlIGlmIChjYyA9PSAnIicpIHsKICAgICAgICAgICAgIHBh cnNlRXJyb3IoKTsKQEAgLTE0ODIsNyArMTQ4Nyw3IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4 dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVO RF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShCZWZvcmVET0NUWVBFU3lzdGVtSWRlbnRpZmll clN0YXRlKSB7Ci0gICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwgY2MgPT0gJ1x4MEEnIHx8IGNj ID09ICdceDBDJyB8fCBjYyA9PSAnICcpCisgICAgICAgIGlmIChpc1Rva2VuaXplcldoaXRlc3Bh Y2UoY2MpKQogICAgICAgICAgICAgQURWQU5DRV9UTyhCZWZvcmVET0NUWVBFU3lzdGVtSWRlbnRp ZmllclN0YXRlKTsKICAgICAgICAgaWYgKGNjID09ICciJykgewogICAgICAgICAgICAgbV90b2tl bi0+c2V0U3lzdGVtSWRlbnRpZmllclRvRW1wdHlTdHJpbmcoKTsKQEAgLTE1NDMsNyArMTU0OCw3 IEBAIGJvb2wgSFRNTFRva2VuaXplcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNl LCBIVE1MVG9rZW4mIHRva2VuKQogICAgIEVORF9TVEFURSgpCiAKICAgICBCRUdJTl9TVEFURShB ZnRlckRPQ1RZUEVTeXN0ZW1JZGVudGlmaWVyU3RhdGUpIHsKLSAgICAgICAgaWYgKGNjID09ICdc eDA5JyB8fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykKKyAgICAg ICAgaWYgKGlzVG9rZW5pemVyV2hpdGVzcGFjZShjYykpCiAgICAgICAgICAgICBBRFZBTkNFX1RP KEFmdGVyRE9DVFlQRVN5c3RlbUlkZW50aWZpZXJTdGF0ZSk7CiAgICAgICAgIGVsc2UgaWYgKGNj ID09ICc+JykKICAgICAgICAgICAgIHJldHVybiBlbWl0QW5kUmVzdW1lSW4oc291cmNlLCBEYXRh U3RhdGUpOwo=