39642 2010-05-24 19:29:36 -0700 Add RCDATA and RAWTEXT suport to the HTML5 parser 2010-05-24 19:40:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 eric eric abarth oldest_to_newest 230047 0 eric 2010-05-24 19:29:36 -0700 Add RCDATA and RAWTEXT suport to the HTML5 parser 230048 1 56961 eric 2010-05-24 19:31:19 -0700 Created attachment 56961 parser half of RCDATA and RAWTEXT control 230050 2 eric 2010-05-24 19:31:31 -0700 *** Bug 39641 has been marked as a duplicate of this bug. *** 230051 3 56962 abarth 2010-05-24 19:38:44 -0700 Created attachment 56962 Patch 230052 4 abarth 2010-05-24 19:40:04 -0700 Committed r60116: <http://trac.webkit.org/changeset/60116> 56961 2010-05-24 19:31:19 -0700 2010-05-24 19:38:40 -0700 parser half of RCDATA and RAWTEXT control bug-39642-20100524193117.patch text/plain 2519 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzFmNGQ0NjEyMDIwMjAzNTE4MjljYmUwY2M4NDgwMjE1MTNkMzAwMS4uNTA0NTQ4MmExNjJmZWU5 YjE2ODdjMjNjMDM0MWUwN2YxYjRkODE2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxMC0wNS0yNCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIFJDREFUQSBhbmQgUkFXVEVYVCBzdXBvcnQgdG8gdGhl IEhUTUw1IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mzk2NDIKKworICAgICAgICBUaGlzIG5lZWRzIEFkYW0ncyBhd2Vzb21lIExleGVyIGhh bGYgdG8gd29yay4KKworICAgICAgICAqIGh0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjpwYXNzVG9rZW5Ub0xlZ2FjeVBhcnNlcik6 CisKKzIwMTAtMDUtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAg IFVucmV2aWV3ZWQuICBUcmljayBNU1ZDIGludG8gaWdub3Jpbmcgb3VyIHVudXNlZCBjb2RlIGZv ciB0aGUgbW9tZW50LgogCiAgICAgICAgIFByZXBhcmUgSFRNTDVUcmVlQnVpbGRlciBmb3IgYWRk aXRpb24gb2YgbmV3IEhUTUw1IHBhcnNlciBjb2RlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTDVUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAK aW5kZXggMWZhZWUxNmI3YTE3Y2JiNjZiNzAxM2NiMTRlOTFjYjcyZGU3NTA5My4uMzJhMmFmNWMw M2FlZDdlNzZiNGUzZDA4ODdhMGJlNWJjM2IwNTNiZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0hUTUw1VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVy LmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIkhUTUw1TGV4ZXIuaCIKICNpbmNsdWRl ICJIVE1MNVRva2VuLmgiCiAjaW5jbHVkZSAiSFRNTERvY3VtZW50LmgiCisjaW5jbHVkZSAiSFRN TE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRNTFBhcnNlci5oIgogI2luY2x1ZGUgIkhUTUxUb2tlbml6 ZXIuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgpAQCAtMzcsNiArMzgsOCBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKK3VzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CisKIEhUTUw1 VHJlZUJ1aWxkZXI6OkhUTUw1VHJlZUJ1aWxkZXIoSFRNTDVMZXhlciogbGV4ZXIsIEhUTUxEb2N1 bWVudCogZG9jdW1lbnQsIGJvb2wgcmVwb3J0RXJyb3JzKQogICAgIDogbV9kb2N1bWVudChkb2N1 bWVudCkKICAgICAsIG1fcmVwb3J0RXJyb3JzKHJlcG9ydEVycm9ycykKQEAgLTkyLDEwICs5NSwx NyBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0VG9PbGRTdHlsZShIVE1MNVRva2VuJiB0b2tlbiwgVG9r ZW4mIG9sZFN0eWxlVG9rZW4pCiAKIFBhc3NSZWZQdHI8Tm9kZT4gSFRNTDVUcmVlQnVpbGRlcjo6 cGFzc1Rva2VuVG9MZWdhY3lQYXJzZXIoSFRNTDVUb2tlbiYgdG9rZW4pCiB7Ci0gICAgaWYgKHRv a2VuLnR5cGUoKSA9PSBIVE1MNVRva2VuOjpTdGFydFRhZyAmJiB0b2tlbi5uYW1lKCkgPT0gInNj cmlwdCIpIHsKKyAgICBpZiAodG9rZW4udHlwZSgpID09IEhUTUw1VG9rZW46OlN0YXJ0VGFnKSB7 CiAgICAgICAgIC8vIFRoaXMgd29yayBpcyBzdXBwb3NlZCB0byBiZSBkb25lIGJ5IHRoZSBwYXJz ZXIsIGJ1dAogICAgICAgICAvLyB3aGVuIHVzaW5nIHRoZSBvbGQgcGFyc2VyIGZvciB3ZSBoYXZl IHRvIGRvIHRoaXMgbWFudWFsbHkuCi0gICAgICAgIG1fbGV4ZXItPnNldFN0YXRlKEhUTUw1TGV4 ZXI6OlNjcmlwdERhdGFTdGF0ZSk7CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gc2NyaXB0 VGFnKQorICAgICAgICAgICAgbV9sZXhlci0+c2V0U3RhdGUoSFRNTDVMZXhlcjo6U2NyaXB0RGF0 YVN0YXRlKTsKKyAgICAgICAgZWxzZSBpZiAodG9rZW4ubmFtZSgpID09IHRleHRhcmVhVGFnIHx8 IHRva2VuLm5hbWUoKSA9PSB0aXRsZVRhZykKKyAgICAgICAgICAgIG1fbGV4ZXItPnNldFN0YXRl KEhUTUw1TGV4ZXI6OlJDREFUQVN0YXRlKTsKKyAgICAgICAgZWxzZSBpZiAodG9rZW4ubmFtZSgp ID09IHN0eWxlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBpZnJhbWVUYWcgfHwgdG9rZW4ubmFtZSgp ID09IHhtcFRhZykgeworICAgICAgICAgICAgLy8gRklYTUU6IG5vc2NyaXB0LCBub2ZyYW1lcywg YW5kIG5vZW1iZWQgbWF5IGNvbmRpdGlvbmFsbHkgZW50ZXIgdGhpcyBzdGF0ZSBhcyB3ZWxsLgor ICAgICAgICAgICAgbV9sZXhlci0+c2V0U3RhdGUoSFRNTDVMZXhlcjo6UkFXVEVYVFN0YXRlKTsK KyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICh0b2tlbi50eXBlKCkgPT0gSFRNTDVUb2tlbjo6 RE9DVFlQRSkgewo= 56962 2010-05-24 19:38:44 -0700 2010-05-24 19:39:25 -0700 Patch bug-39642-20100524193842.patch text/plain 11721 abarth ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0bWw1bGliL3dlYmtpdC1ydW5uZXItZXhwZWN0ZWQt aHRtbDUudHh0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvd2Via2l0LXJ1bm5lci1leHBlY3RlZC1o dG1sNS50eHQKaW5kZXggMmM3NmU4ZjM4YWM3YzIzNTc1MDY5N2ZmZDljMDhkY2NlNDE3MTA3Ni4u ZWFlZTdlMmY4YTdhOGVlY2YzOWY1MTFlMDY5OGI4OWM2ZTA0NDMxZCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHRtbDVsaWIvd2Via2l0LXJ1bm5lci1leHBlY3RlZC1odG1sNS50eHQKKysrIGIv TGF5b3V0VGVzdHMvaHRtbDVsaWIvd2Via2l0LXJ1bm5lci1leHBlY3RlZC1odG1sNS50eHQKQEAg LTIzLDE1ICsyMywxNSBAQCBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogU3ludGF4RXJyb3I6IFBh cnNlIGVycm9yCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogU3ludGF4RXJyb3I6IFBhcnNlIGVy cm9yCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogU3ludGF4RXJyb3I6IFBhcnNlIGVycm9yCiBD b250ZW50LVR5cGU6IHRleHQvcGxhaW4KLXJlc291cmNlcy90ZXN0czEuZGF0OiAyNSwgMjYsIDI5 LCAzMCwgMzIsIDMzLCAzNCwgMzUsIDM3LCAzOCwgMzksIDQwLCA0MSwgNDIsIDQzLCA0NCwgNDUs IDQ2LCA0NywgNDgsIDUwLCA1MSwgNTIsIDUzLCA1NCwgNTcsIDU5LCA3OCwgNzksIDgwLCA4MSwg ODIsIDgzLCA4NCwgODcsIDg4LCA5MCwgOTEsIDkyLCA5NiwgOTgsIDEwMSwgMTA0LCAxMDYsIDEw OSwgMTEzCityZXNvdXJjZXMvdGVzdHMxLmRhdDogMjUsIDI5LCAzMCwgMzIsIDMzLCAzNCwgMzUs IDM3LCAzOCwgMzksIDQwLCA0MSwgNDIsIDQzLCA0NCwgNDUsIDQ2LCA0NywgNDgsIDUwLCA1MSwg NTIsIDUzLCA1NCwgNTcsIDU5LCA3OCwgNzksIDgwLCA4MSwgODIsIDg3LCA5MCwgOTEsIDkyLCA5 NiwgOTgsIDEwMSwgMTA0LCAxMDYsIDEwOSwgMTEzCiAKLXJlc291cmNlcy90ZXN0czIuZGF0OiAy LCA2LCA3LCA4LCA5LCAxMCwgMTEsIDEyLCAxNiwgMTcsIDE4LCAxOSwgMjAsIDIxLCAyMiwgMjMs IDI5LCAzMCwgMzIsIDMzLCAzNiwgNDAsIDQyLCA0NCwgNDUsIDUzLCA1NCwgNTcKK3Jlc291cmNl cy90ZXN0czIuZGF0OiA2LCA3LCA4LCA5LCAxMCwgMTEsIDEyLCAxNiwgMTcsIDE4LCAxOSwgMjAs IDIxLCAyMiwgMjMsIDI5LCAzMCwgMzIsIDMzLCAzNiwgNDAsIDQyLCA0NCwgNDUsIDUzLCA1NCwg NTcKIAotcmVzb3VyY2VzL3Rlc3RzMy5kYXQ6IDUsIDYsIDcsIDgsIDE0LCAxNSwgMTYsIDE3LCAx OCwgMTkKK3Jlc291cmNlcy90ZXN0czMuZGF0OiA1LCA2LCA3LCA4LCAxNiwgMTcsIDE4LCAxOQog CiByZXNvdXJjZXMvdGVzdHM0LmRhdDogMywgNSwgNiwgNwogCi1yZXNvdXJjZXMvdGVzdHM1LmRh dDogMSwgMiwgMywgNCwgNSwgNiwgNywgOCwgOSwgMTAsIDEyLCAxMywgMTQsIDE1LCAxNgorcmVz b3VyY2VzL3Rlc3RzNS5kYXQ6IDIsIDYsIDcsIDgsIDksIDEzLCAxNCwgMTYKIAogcmVzb3VyY2Vz L3Rlc3RzNi5kYXQ6IDEsIDMsIDQsIDYsIDgsIDksIDEwLCAxMSwgMTIsIDI3LCAyOSwgMzAsIDMx LCAzNywgNDQsIDQ1LCA0NiwgNDcsIDQ4LCA0OSwgNTAsIDUxCiAKQEAgLTUxLDcgKzUxLDcgQEAg cmVzb3VyY2VzL3Rlc3RzMTQuZGF0OiBQQVNTCiAKIHJlc291cmNlcy90ZXN0czE1LmRhdDogMywg NCwgNSwgNiwgNywgMTEsIDEyLCAxMwogCi1yZXNvdXJjZXMvdGVzdHMxNi5kYXQ6IDMsIDQsIDUs IDYsIDcsIDgsIDksIDEwLCAxMiwgMTMsIDE0LCAxNSwgMTYsIDE3LCAyNSwgMjcsIDI4LCA0Miwg NDQsIDQ1LCA1NiwgNTcsIDU4LCA3MywgNzQsIDc1LCA3NiwgNzcsIDc4LCA3OSwgODAsIDgxLCA4 MiwgODMsIDg0LCA4NSwgODYsIDg3LCA4OCwgODksIDkwLCA5MSwgOTIsIDkzLCA5NCwgOTcsIDk4 LCA5OSwgMTAwLCAxMDEsIDEwMiwgMTAzLCAxMDQsIDEwNiwgMTA3LCAxMDgsIDEwOSwgMTEwLCAx MTEsIDExOSwgMTIxLCAxMjIsIDEzNiwgMTM4LCAxMzksIDE0OCwgMTQ5LCAxNTAsIDE2NSwgMTY2 LCAxNjcsIDE2OCwgMTY5LCAxNzAsIDE3MSwgMTcyLCAxNzMsIDE3NCwgMTc1LCAxNzYsIDE3Nywg MTc4LCAxNzksIDE4MCwgMTgxLCAxODIsIDE4MywgMTg0LCAxODUsIDE4NgorcmVzb3VyY2VzL3Rl c3RzMTYuZGF0OiAzLCA0LCA1LCA2LCA3LCA4LCA5LCAxMCwgMTIsIDEzLCAxNCwgMTUsIDE2LCAx NywgMjUsIDI3LCAyOCwgNDIsIDQ0LCA0NSwgNTYsIDU3LCA1OCwgODIsIDg0LCA4NSwgODYsIDg3 LCA4OCwgOTAsIDk0LCA5NywgOTgsIDk5LCAxMDAsIDEwMSwgMTAyLCAxMDMsIDEwNCwgMTA2LCAx MDcsIDEwOCwgMTA5LCAxMTAsIDExMSwgMTE5LCAxMjEsIDEyMiwgMTM2LCAxMzgsIDEzOSwgMTQ4 LCAxNDksIDE1MCwgMTc0LCAxNzYsIDE3NywgMTc4LCAxNzksIDE4MCwgMTgyLCAxODYKIAogcmVz b3VyY2VzL3dlYmtpdDAxLmRhdDogUEFTUwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQ5MTg4MGQ2NmM2NmY5NTI1N2IxMTkxNDVmODMw OGE2ZjEyYmZkYTguLjRhY2FjMmRmMzJlZTIxZmQwYWM1YzBlZjUyMDI2ZmQ3NGMwM2QxMGEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDUtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBSQ0RB VEEgYW5kIFJBV1RFWFQgc3Vwb3J0IHRvIHRoZSBIVE1MNSBwYXJzZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NjQyCisKKyAgICAgICAgQWRhbSBC YXJ0aCB3cm90ZSBoYWxmIG9mIHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiBodG1sL0hUTUw1VHJl ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVUcmVlQnVpbGRlcjo6cGFzc1Rv a2VuVG9MZWdhY3lQYXJzZXIpOgorCiAyMDEwLTA1LTI0ICBUb255IENoYW5nICA8dG9ueUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkLCBidWlsZCBmaXguCmRpZmYgLS1naXQg YS9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5j cHAKaW5kZXggZmJhZTVjZTViMzM3NTcxODQ4ZTc5M2VkZmFkYjkxNjQ4MzRmMTg1ZC4uZjJkMDA4 MmQ1YTI4YmVjMmU3MWNiYzEyMmM2Y2ZlZDgyN2ZiYjVhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9o dG1sL0hUTUw1TGV4ZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcApAQCAt MzYxLDYgKzM2MSw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmlu ZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgY2FzZSBSQ0RBVEFMZXNzVGhh blNpZ25TdGF0ZTogewogICAgICAgICAgICAgaWYgKGNjID09ICcvJykgewogICAgICAgICAgICAg ICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmNsZWFyKCk7CisgICAgICAgICAgICAgICAgQVNTRVJUKG1f YnVmZmVyZWRFbmRUYWdOYW1lLmlzRW1wdHkoKSk7CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9 IFJDREFUQUVuZFRhZ09wZW5TdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICAgICAgZW1pdENoYXJhY3RlcignPCcpOwpAQCAtMzcxLDExICszNzIsMTQgQEAgYm9vbCBIVE1M NUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRv a2VuKQogICAgICAgICB9CiAgICAgICAgIGNhc2UgUkNEQVRBRW5kVGFnT3BlblN0YXRlOiB7CiAg ICAgICAgICAgICBpZiAoY2MgPj0gJ0EnICYmIGNjIDw9ICdaJykgewotICAgICAgICAgICAgICAg IG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBw ZW5kKGNjKTsKKyAgICAgICAgICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5hcHBlbmQodG9M b3dlckNhc2UoY2MpKTsKICAgICAgICAgICAgICAgICBtX3N0YXRlID0gUkNEQVRBRW5kVGFnTmFt ZVN0YXRlOwogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA+PSAnYScgJiYgY2MgPD0gJ3onKSB7 Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgICAgICBtX3Rl bXBvcmFyeUJ1ZmZlci5hcHBlbmQoY2MpOworICAgICAgICAgICAgICAgIG1fYnVmZmVyZWRFbmRU YWdOYW1lLmFwcGVuZChjYyk7CiAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IFJDREFUQUVuZFRh Z05hbWVTdGF0ZTsKKyAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgZW1pdENo YXJhY3RlcignPCcpOwogICAgICAgICAgICAgICAgIGVtaXRDaGFyYWN0ZXIoJy8nKTsKICAgICAg ICAgICAgICAgICBtX3N0YXRlID0gUkNEQVRBU3RhdGU7CkBAIC0zODQsMjMgKzM4OCwzNiBAQCBi b29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVU b2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNl IFJDREFUQUVuZFRhZ05hbWVTdGF0ZTogewotICAgICAgICAgICAgaWYgKGNjID09ICdceDA5JyB8 fCBjYyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykgewotICAgICAgICAg ICAgICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgICAgICAgICAgICAgbV9zdGF0ZSA9IEJlZm9y ZUF0dHJpYnV0ZU5hbWVTdGF0ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJy8nKSB7 Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgICAgICAgICBtX3N0 YXRlID0gU2VsZkNsb3NpbmdTdGFydFRhZ1N0YXRlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChj YyA9PSAnPicpIHsKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgICAgICAg ICAgICAgIG1fc3RhdGUgPSBEYXRhU3RhdGU7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGNjID49 ICdBJyAmJiBjYyA8PSAnWicpCi0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAg ICAgICAgICAgIGVsc2UgaWYgKGNjID49ICdhJyAmJiBjYyA8PSAneicpCi0gICAgICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgaWYg KGNjID49ICdBJyAmJiBjYyA8PSAnWicpIHsKKyAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1 ZmZlci5hcHBlbmQoY2MpOworICAgICAgICAgICAgICAgIG1fYnVmZmVyZWRFbmRUYWdOYW1lLmFw cGVuZCh0b0xvd2VyQ2FzZShjYykpOworICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA+PSAnYScg JiYgY2MgPD0gJ3onKSB7CisgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5k KGNjKTsKKyAgICAgICAgICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5hcHBlbmQoY2MpOwor ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBpZiAoY2MgPT0gJ1x4MDknIHx8 IGNjID09ICdceDBBJyB8fCBjYyA9PSAnXHgwQycgfHwgY2MgPT0gJyAnKSB7CisgICAgICAgICAg ICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRlRW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgIG1fc3RhdGUgPSBCZWZvcmVBdHRyaWJ1dGVOYW1lU3RhdGU7CisgICAgICAgICAgICAg ICAgICAgICAgICBtYXliZUZsdXNoQnVmZmVyZWRFbmRUYWcoKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBl bHNlIGlmIChjYyA9PSAnLycpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlh dGVFbmRUYWcoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgbV9zdGF0ZSA9IFNlbGZDbG9z aW5nU3RhcnRUYWdTdGF0ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1heWJlRmx1c2hCdWZm ZXJlZEVuZFRhZygpOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGNjID09ICc+JykgeworICAg ICAgICAgICAgICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICBtX3N0YXRlID0gRGF0YVN0YXRlOworICAgICAgICAgICAgICAgICAgICAg ICAgbWF5YmVGbHVzaEJ1ZmZlcmVkRW5kVGFnKCk7CisgICAgICAgICAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICBlbWl0Q2hhcmFjdGVyKCc8Jyk7CiAgICAgICAgICAgICAgICAgZW1pdENoYXJhY3Rl cignLycpOwotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAg ICAgbV90b2tlbi0+YXBwZW5kVG9DaGFyYWN0ZXIobV90ZW1wb3JhcnlCdWZmZXIpOworICAgICAg ICAgICAgICAgIG1fYnVmZmVyZWRFbmRUYWdOYW1lLmNsZWFyKCk7CiAgICAgICAgICAgICAgICAg bV9zdGF0ZSA9IFJDREFUQVN0YXRlOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgfQpAQCAtNDA5LDYgKzQyNiw3IEBAIGJvb2wgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNl Z21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgY2FzZSBS QVdURVhUTGVzc1RoYW5TaWduU3RhdGU6IHsKICAgICAgICAgICAgIGlmIChjYyA9PSAnLycpIHsK ICAgICAgICAgICAgICAgICBtX3RlbXBvcmFyeUJ1ZmZlci5jbGVhcigpOworICAgICAgICAgICAg ICAgIEFTU0VSVChtX2J1ZmZlcmVkRW5kVGFnTmFtZS5pc0VtcHR5KCkpOwogICAgICAgICAgICAg ICAgIG1fc3RhdGUgPSBSQVdURVhURW5kVGFnT3BlblN0YXRlOwogICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICBlbWl0Q2hhcmFjdGVyKCc8Jyk7CkBAIC00MTksMTAgKzQzNywx MiBAQCBib29sIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwg SFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgIH0KICAgICAgICAgY2FzZSBSQVdURVhURW5kVGFn T3BlblN0YXRlOiB7CiAgICAgICAgICAgICBpZiAoY2MgPj0gJ0EnICYmIGNjIDw9ICdaJykgewot ICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAgICAgbV90ZW1w b3JhcnlCdWZmZXIuYXBwZW5kKGNjKTsKKyAgICAgICAgICAgICAgICBtX2J1ZmZlcmVkRW5kVGFn TmFtZS5hcHBlbmQodG9Mb3dlckNhc2UoY2MpKTsKICAgICAgICAgICAgICAgICBtX3N0YXRlID0g UkFXVEVYVEVuZFRhZ05hbWVTdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPj0gJ2En ICYmIGNjIDw9ICd6JykgewotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAg ICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZmZXIuYXBwZW5kKGNjKTsKKyAgICAgICAgICAgICAg ICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5hcHBlbmQoY2MpOwogICAgICAgICAgICAgICAgIG1fc3Rh dGUgPSBSQVdURVhURW5kVGFnTmFtZVN0YXRlOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgICAgICBlbWl0Q2hhcmFjdGVyKCc8Jyk7CkBAIC00MzMsMjYgKzQ1Myw0MCBAQCBib29s IEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tl biYgdG9rZW4pCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFJB V1RFWFRFbmRUYWdOYW1lU3RhdGU6IHsKLSAgICAgICAgICAgIGlmIChjYyA9PSAnXHgwOScgfHwg Y2MgPT0gJ1x4MEEnIHx8IGNjID09ICdceDBDJyB8fCBjYyA9PSAnICcpIHsKLSAgICAgICAgICAg ICAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgICAgICAgICAgICAgIG1fc3RhdGUgPSBCZWZvcmVB dHRyaWJ1dGVOYW1lU3RhdGU7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGNjID09ICcvJykgewot ICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgICAgICAgICAgICAgbV9zdGF0 ZSA9IFNlbGZDbG9zaW5nU3RhcnRUYWdTdGF0ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoY2Mg PT0gJz4nKSB7Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgICAg ICAgICBtX3N0YXRlID0gRGF0YVN0YXRlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA+PSAn QScgJiYgY2MgPD0gJ1onKQotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAg ICAgICAgICBlbHNlIGlmIChjYyA+PSAnYScgJiYgY2MgPD0gJ3onKQotICAgICAgICAgICAgICAg IG5vdEltcGxlbWVudGVkKCk7Ci0gICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmIChj YyA+PSAnQScgJiYgY2MgPD0gJ1onKSB7CisgICAgICAgICAgICAgICAgbV90ZW1wb3JhcnlCdWZm ZXIuYXBwZW5kKGNjKTsKKyAgICAgICAgICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5hcHBl bmQodG9Mb3dlckNhc2UoY2MpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPj0gJ2EnICYm IGNjIDw9ICd6JykgeworICAgICAgICAgICAgICAgIG1fdGVtcG9yYXJ5QnVmZmVyLmFwcGVuZChj Yyk7CisgICAgICAgICAgICAgICAgbV9idWZmZXJlZEVuZFRhZ05hbWUuYXBwZW5kKGNjKTsKKyAg ICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgaWYgKGNjID09ICdceDA5JyB8fCBj YyA9PSAnXHgwQScgfHwgY2MgPT0gJ1x4MEMnIHx8IGNjID09ICcgJykgeworICAgICAgICAgICAg ICAgICAgICBpZiAoaXNBcHByb3ByaWF0ZUVuZFRhZygpKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICBtX3N0YXRlID0gQmVmb3JlQXR0cmlidXRlTmFtZVN0YXRlOworICAgICAgICAgICAgICAg ICAgICAgICAgbWF5YmVGbHVzaEJ1ZmZlcmVkRW5kVGFnKCk7CisgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAoY2MgPT0gJy8nKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChpc0FwcHJvcHJpYXRl RW5kVGFnKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc3RhdGUgPSBTZWxmQ2xvc2lu Z1N0YXJ0VGFnU3RhdGU7CisgICAgICAgICAgICAgICAgICAgICAgICBtYXliZUZsdXNoQnVmZmVy ZWRFbmRUYWcoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA9PSAnPicpIHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKGlzQXBwcm9wcmlhdGVFbmRUYWcoKSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgbV9zdGF0ZSA9IERhdGFTdGF0ZTsKKyAgICAgICAgICAgICAgICAgICAgICAg IG1heWJlRmx1c2hCdWZmZXJlZEVuZFRhZygpOworICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgZW1pdENoYXJhY3RlcignPCcpOwogICAgICAgICAgICAgICAgIGVtaXRDaGFyYWN0ZXIo Jy8nKTsKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICAgICAgICAg IG1fdG9rZW4tPmFwcGVuZFRvQ2hhcmFjdGVyKG1fdGVtcG9yYXJ5QnVmZmVyKTsKKyAgICAgICAg ICAgICAgICBtX2J1ZmZlcmVkRW5kVGFnTmFtZS5jbGVhcigpOwogICAgICAgICAgICAgICAgIG1f c3RhdGUgPSBSQVdURVhUU3RhdGU7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg ICAgICB9CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFNjcmlw dERhdGFMZXNzVGhhblNpZ25TdGF0ZTogewogICAgICAgICAgICAgaWYgKGNjID09ICcvJykgewpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9o dG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwCmluZGV4IDFmYWVlMTZiN2ExN2NiYjY2YjcwMTNjYjE0 ZTkxY2I3MmRlNzUwOTMuLjMyYTJhZjVjMDNhZWQ3ZTc2YjRlM2QwODg3YTBiZTViYzNiMDUzYmQg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJD b3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRl ICJIVE1MNUxleGVyLmgiCiAjaW5jbHVkZSAiSFRNTDVUb2tlbi5oIgogI2luY2x1ZGUgIkhUTUxE b2N1bWVudC5oIgorI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxQYXJzZXIu aCIKICNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQu aCIKQEAgLTM3LDYgKzM4LDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCit1c2luZyBuYW1l c3BhY2UgSFRNTE5hbWVzOworCiBIVE1MNVRyZWVCdWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVyKEhU TUw1TGV4ZXIqIGxleGVyLCBIVE1MRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIHJlcG9ydEVycm9y cykKICAgICA6IG1fZG9jdW1lbnQoZG9jdW1lbnQpCiAgICAgLCBtX3JlcG9ydEVycm9ycyhyZXBv cnRFcnJvcnMpCkBAIC05MiwxMCArOTUsMTcgQEAgc3RhdGljIHZvaWQgY29udmVydFRvT2xkU3R5 bGUoSFRNTDVUb2tlbiYgdG9rZW4sIFRva2VuJiBvbGRTdHlsZVRva2VuKQogCiBQYXNzUmVmUHRy PE5vZGU+IEhUTUw1VHJlZUJ1aWxkZXI6OnBhc3NUb2tlblRvTGVnYWN5UGFyc2VyKEhUTUw1VG9r ZW4mIHRva2VuKQogewotICAgIGlmICh0b2tlbi50eXBlKCkgPT0gSFRNTDVUb2tlbjo6U3RhcnRU YWcgJiYgdG9rZW4ubmFtZSgpID09ICJzY3JpcHQiKSB7CisgICAgaWYgKHRva2VuLnR5cGUoKSA9 PSBIVE1MNVRva2VuOjpTdGFydFRhZykgewogICAgICAgICAvLyBUaGlzIHdvcmsgaXMgc3VwcG9z ZWQgdG8gYmUgZG9uZSBieSB0aGUgcGFyc2VyLCBidXQKICAgICAgICAgLy8gd2hlbiB1c2luZyB0 aGUgb2xkIHBhcnNlciBmb3Igd2UgaGF2ZSB0byBkbyB0aGlzIG1hbnVhbGx5LgotICAgICAgICBt X2xleGVyLT5zZXRTdGF0ZShIVE1MNUxleGVyOjpTY3JpcHREYXRhU3RhdGUpOworICAgICAgICBp ZiAodG9rZW4ubmFtZSgpID09IHNjcmlwdFRhZykKKyAgICAgICAgICAgIG1fbGV4ZXItPnNldFN0 YXRlKEhUTUw1TGV4ZXI6OlNjcmlwdERhdGFTdGF0ZSk7CisgICAgICAgIGVsc2UgaWYgKHRva2Vu Lm5hbWUoKSA9PSB0ZXh0YXJlYVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGl0bGVUYWcpCisgICAg ICAgICAgICBtX2xleGVyLT5zZXRTdGF0ZShIVE1MNUxleGVyOjpSQ0RBVEFTdGF0ZSk7CisgICAg ICAgIGVsc2UgaWYgKHRva2VuLm5hbWUoKSA9PSBzdHlsZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0g aWZyYW1lVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB4bXBUYWcpIHsKKyAgICAgICAgICAgIC8vIEZJ WE1FOiBub3NjcmlwdCwgbm9mcmFtZXMsIGFuZCBub2VtYmVkIG1heSBjb25kaXRpb25hbGx5IGVu dGVyIHRoaXMgc3RhdGUgYXMgd2VsbC4KKyAgICAgICAgICAgIG1fbGV4ZXItPnNldFN0YXRlKEhU TUw1TGV4ZXI6OlJBV1RFWFRTdGF0ZSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAodG9r ZW4udHlwZSgpID09IEhUTUw1VG9rZW46OkRPQ1RZUEUpIHsK