39342 2010-05-18 22:12:29 -0700 Make the HTML5 parser actually parse <div></div> 2010-05-18 22:30:45 -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 mjs oldest_to_newest 227666 0 abarth 2010-05-18 22:12:29 -0700 Make the HTML5 parser actually parse <div></div> 227668 1 56454 abarth 2010-05-18 22:14:08 -0700 Created attachment 56454 Patch 227672 2 56454 eric 2010-05-18 22:24:04 -0700 Comment on attachment 56454 Patch WebCore/html/HTML5Lexer.cpp:60 + inline UChar toLowerCase(UChar cc) We need to ASSERT that this is safe, or at least comment. Yay! 227674 3 abarth 2010-05-18 22:30:45 -0700 Committed r59745: <http://trac.webkit.org/changeset/59745> 56454 2010-05-18 22:14:08 -0700 2010-05-18 22:24:03 -0700 Patch bug-39342-20100518221407.patch text/plain 8918 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTZkNDMyM2U0OTIxZGVkMDNiMGJlYmQxODcwOThhOGViYTZmMzAwNi4uN2I4Zjg5Nzc5NjUxNzI1 YWI1OTE4NTU2YzdiNjY0MzJkNWJiMjkxNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMyBAQAogMjAxMC0wNS0xOCAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgdGhlIEhUTUw1IHBhcnNlciBhY3R1YWxseSBwYXJz ZSA8ZGl2PjwvZGl2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzkzNDIKKworICAgICAgICBUaGlzIHBhdGNoIGlzIGNvdmVyZWQgYnkgZXZlcnkgTGF5 b3V0VGVzdC4gIFllcy4gIEFsbCBvZiB0aGVtLiAgOikKKworICAgICAgICAqIGh0bWwvSFRNTDVM ZXhlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b0xvd2VyQ2FzZSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MNUxleGVyOjpIVE1MNUxleGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1TGV4 ZXI6Om5leHRUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNUxleGVyOjplbWl0Q2hhcmFj dGVyKToKKyAgICAgICAgKiBodG1sL0hUTUw1TGV4ZXIuaDoKKyAgICAgICAgKiBodG1sL0hUTUw1 VG9rZW4uaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46OkhUTUw1VG9rZW4pOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTDVUb2tlbjo6YmVnaW5TdGFydFRhZyk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MNVRva2VuOjpiZWdpbkVuZFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRv a2VuOjphcHBlbmRUb05hbWUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVUb2tlbjo6dHlwZSk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuOjpuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUw1VG9rZW46OnNlbGZDbG9zaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46 OmF0dHJzKToKKyAgICAgICAgKiBodG1sL0hUTUw1VG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmNvbnZlcnRUb09sZFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW5p emVyOjp3cml0ZSk6CisKKzIwMTAtMDUtMTggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKwogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KIAogICAgICAgICBJbXBsZW1l bnQgdGhlIERPQ1RZUEUgc3RhdGVzIGZvciB0aGUgSFRNTDUgbGV4ZXIKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcApp bmRleCAzYThiMDlhNTliY2YwYjFiZjUyNDc1ZjNhMWFiYWViNzMzOTBhMjAzLi45ZjE0M2RkMDMx M2Y4Y2U3ZTU4MjlhMzIyMWYxZGVhYzMxMThhY2ZhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv SFRNTDVMZXhlci5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUw1TGV4ZXIuY3BwCkBAIC01Nyw4 ICs1NywxNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKK2lubGluZSBVQ2hhciB0b0xvd2VyQ2FzZShVQ2hhciBjYykKK3sKKyAgICBjb25zdCBp bnQgbG93ZXJDYXNlT2Zmc2V0ID0gMHgyMDsKKyAgICByZXR1cm4gY2MgKyBsb3dlckNhc2VPZmZz ZXQ7Cit9CisKIEhUTUw1TGV4ZXI6OkhUTUw1TGV4ZXIoKQotICAgIDogbV9vdXRwdXRUb2tlbigw KQorICAgIDogbV90b2tlbigwKQogICAgICwgbV9hZGRpdGlvbmFsQWxsb3dlZENoYXJhY3Rlcign XDAnKQogewogfQpAQCAtMjA1LDcgKzIxMSw3IEBAIG91dE9mQ2hhcmFjdGVyczoKIAogdm9pZCBI VE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4m IHRva2VuKQogewotICAgIG1fb3V0cHV0VG9rZW4gPSAmdG9rZW47CisgICAgbV90b2tlbiA9ICZ0 b2tlbjsKICAgICAvLyBTb3VyY2U6IGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBw cy9jdXJyZW50LXdvcmsvI3Rva2VuaXNhdGlvbjAKICAgICAvLyBGSVhNRTogVGhpcyB3aGlsZSBz aG91bGQgc3RvcCBhcyBzb29uIGFzIHdlIGhhdmUgYSB0b2tlbiB0byByZXR1cm4uCiAgICAgd2hp bGUgKCFzb3VyY2UuaXNFbXB0eSgpKSB7CkBAIC0yNjEsMTAgKzI2NywxMCBAQCB2b2lkIEhUTUw1 TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9r ZW4pCiAgICAgICAgICAgICBlbHNlIGlmIChjYyA9PSAnLycpCiAgICAgICAgICAgICAgICAgbV9z dGF0ZSA9IEVuZFRhZ09wZW5TdGF0ZTsKICAgICAgICAgICAgIGVsc2UgaWYgKGNjID49ICdBJyAm JiBjYyA8PSAnWicpIHsKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAg ICAgICAgICAgIG1fdG9rZW4tPmJlZ2luU3RhcnRUYWcodG9Mb3dlckNhc2UoY2MpKTsKICAgICAg ICAgICAgICAgICBtX3N0YXRlID0gVGFnTmFtZVN0YXRlOwogICAgICAgICAgICAgfSBlbHNlIGlm IChjYyA+PSAnYScgJiYgY2MgPD0gJ3onKSB7Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50 ZWQoKTsKKyAgICAgICAgICAgICAgICBtX3Rva2VuLT5iZWdpblN0YXJ0VGFnKGNjKTsKICAgICAg ICAgICAgICAgICBtX3N0YXRlID0gVGFnTmFtZVN0YXRlOwogICAgICAgICAgICAgfSBlbHNlIGlm IChjYyA9PSAnPycpIHsKICAgICAgICAgICAgICAgICBlbWl0UGFyc2VFcnJvcigpOwpAQCAtMjc5 LDEwICsyODUsMTAgQEAgdm9pZCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5n JiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAgICB9CiAgICAgICAgIGNhc2UgRW5k VGFnT3BlblN0YXRlOiB7CiAgICAgICAgICAgICBpZiAoY2MgPj0gJ0EnICYmIGNjIDw9ICdaJykg ewotICAgICAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAgICAgbV90 b2tlbi0+YmVnaW5FbmRUYWcodG9Mb3dlckNhc2UoY2MpKTsKICAgICAgICAgICAgICAgICBtX3N0 YXRlID0gVGFnTmFtZVN0YXRlOwogICAgICAgICAgICAgfSBlbHNlIGlmIChjYyA+PSAnYScgJiYg Y2MgPD0gJ3onKSB7Ci0gICAgICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAg ICAgICAgICBtX3Rva2VuLT5iZWdpbkVuZFRhZyhjYyk7CiAgICAgICAgICAgICAgICAgbV9zdGF0 ZSA9IFRhZ05hbWVTdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoY2MgPT0gJz4nKSB7CiAg ICAgICAgICAgICAgICAgZW1pdFBhcnNlRXJyb3IoKTsKQEAgLTI5OSwxMiArMzA1LDEzIEBAIHZv aWQgSFRNTDVMZXhlcjo6bmV4dFRva2VuKFNlZ21lbnRlZFN0cmluZyYgc291cmNlLCBIVE1MNVRv a2VuJiB0b2tlbikKICAgICAgICAgICAgICAgICBtX3N0YXRlID0gQmVmb3JlQXR0cmlidXRlTmFt ZVN0YXRlOwogICAgICAgICAgICAgZWxzZSBpZiAoY2MgPT0gJy8nKQogICAgICAgICAgICAgICAg IG1fc3RhdGUgPSBTZWxmQ2xvc2luZ1N0YXJ0VGFnU3RhdGU7Ci0gICAgICAgICAgICBlbHNlIGlm IChjYyA9PSAnPicpCisgICAgICAgICAgICBlbHNlIGlmIChjYyA9PSAnPicpIHsKICAgICAgICAg ICAgICAgICBtX3N0YXRlID0gRGF0YVN0YXRlOwotICAgICAgICAgICAgZWxzZSBpZiAoY2MgPj0g J0EnICYmIGNjIDw9ICdaJykKLSAgICAgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAg ICAgICAgICAgICAgIHJldHVybiBlbWl0Q3VycmVudFRhZ1Rva2VuKCk7CisgICAgICAgICAgICB9 IGVsc2UgaWYgKGNjID49ICdBJyAmJiBjYyA8PSAnWicpCisgICAgICAgICAgICAgICAgbV90b2tl bi0+YXBwZW5kVG9OYW1lKHRvTG93ZXJDYXNlKGNjKSk7CiAgICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgICAgICBtX3Rva2VuLT5h cHBlbmRUb05hbWUoY2MpOwogICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBFT0YgcHJvcGVy bHkuCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTE4OSw3ICsxMTk2LDcgQEAg dm9pZCBIVE1MNUxleGVyOjpuZXh0VG9rZW4oU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1 VG9rZW4mIHRva2VuKQogICAgICAgICB9CiAgICAgICAgIHNvdXJjZS5hZHZhbmNlKCk7CiAgICAg fQotICAgIG1fb3V0cHV0VG9rZW4gPSAwOworICAgIG1fdG9rZW4gPSAwOwogfQogCiBpbmxpbmUg Ym9vbCBIVE1MNUxleGVyOjp0ZW1wb3JhcnlCdWZmZXJJcyhjb25zdCBjaGFyKikKQEAgLTEyMDMs OSArMTIxMCw5IEBAIGlubGluZSB2b2lkIEhUTUw1TGV4ZXI6OmVtaXRDb21tZW50VG9rZW4oKQog ICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLWlubGluZSB2b2lkIEhUTUw1TGV4ZXI6OmVtaXRD aGFyYWN0ZXIoVUNoYXIgY2hhcmFjdGVyKQoraW5saW5lIHZvaWQgSFRNTDVMZXhlcjo6ZW1pdENo YXJhY3RlcihVQ2hhcikKIHsKLSAgICBtX291dHB1dFRva2VuLT5zZXRUb0NoYXJhY3RlcihjaGFy YWN0ZXIpOworICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKIGlubGluZSB2b2lkIEhUTUw1TGV4 ZXI6OmVtaXRQYXJzZUVycm9yKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVy LmggYi9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5oCmluZGV4IGJjY2NjNDZmYzQzNzViMmJkODIw MjJjYzdkYjE0NTU0YTVkYTgyMTcuLjdmYjQzZjQ2ZjdjZjEwNmY2NWY0MTk3MzNhNzlkZjViZTRh MmRlMzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmgKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUw1TGV4ZXIuaApAQCAtNTYsNyArNTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIGlubGluZSBib29sIHRlbXBvcmFyeUJ1ZmZlcklzKGNvbnN0IGNoYXIqKTsKIAog ICAgICAgICBTZWdtZW50ZWRTdHJpbmcgbV9zb3VyY2U7Ci0gICAgICAgIEhUTUw1VG9rZW4qIG1f b3V0cHV0VG9rZW47CisgICAgICAgIEhUTUw1VG9rZW4qIG1fdG9rZW47CiAKICAgICAgICAgZW51 bSBTdGF0ZSB7CiAgICAgICAgICAgICBEYXRhU3RhdGUsCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0 bWwvSFRNTDVUb2tlbi5oIGIvV2ViQ29yZS9odG1sL0hUTUw1VG9rZW4uaAppbmRleCBiNTdkMDZm NWRkMWY0ODg1MDYxNjQ4MDgxMmY2MzNkMGMzY2Q3MjcxLi44M2FlMjQzZmE5MWNmMzY2NGVlMDY2 YWE2YjUyODY4ZmY4OThkMmY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbi5o CisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuLmgKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lu Y2x1ZGUgIk5hbWVkTWFwcGVkQXR0ck1hcC5oIgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00 NywyMSArNDgsNTYgQEAgcHVibGljOgogICAgICAgICA6IG1fdHlwZSh0eXBlKQogICAgICAgICAs IG1fZm9yY2VRdWlya3MoZmFsc2UpCiAgICAgICAgICwgbV9zZWxmQ2xvc2luZyhmYWxzZSkKLSAg ICAgICAgLCBtX2NoYXJhY3RlcigwKQogICAgIHsKICAgICB9CiAKLSAgICBpbmxpbmUgdm9pZCBz ZXRUb0NoYXJhY3RlcihVQ2hhciBjaGFyYWN0ZXIpCisgICAgdm9pZCBiZWdpblN0YXJ0VGFnKFVD aGFyIGNoYXJhY3RlcikKICAgICB7Ci0gICAgICAgIG1fdHlwZSA9IENoYXJhY3RlcjsKLSAgICAg ICAgbV9jaGFyYWN0ZXIgPSBjaGFyYWN0ZXI7CisgICAgICAgIG1fdHlwZSA9IFN0YXJ0VGFnOwor ICAgICAgICBtX2RhdGEuY2xlYXIoKTsKKyAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIp OworICAgIH0KKworICAgIHZvaWQgYmVnaW5FbmRUYWcoVUNoYXIgY2hhcmFjdGVyKQorICAgIHsK KyAgICAgICAgbV90eXBlID0gRW5kVGFnOworICAgICAgICBtX2RhdGEuY2xlYXIoKTsKKyAgICAg ICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIpOworICAgIH0KKworICAgIHZvaWQgYXBwZW5kVG9O YW1lKFVDaGFyIGNoYXJhY3RlcikKKyAgICB7CisgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gU3Rh cnRUYWcgfHwgbV90eXBlID09IEVuZFRhZyB8fCBtX3R5cGUgPT0gRE9DVFlQRSk7CisgICAgICAg IG1fZGF0YS5hcHBlbmQoY2hhcmFjdGVyKTsKKyAgICB9CisKKyAgICBUeXBlIHR5cGUoKSBjb25z dCB7IHJldHVybiBtX3R5cGU7IH0KKworICAgIEF0b21pY1N0cmluZyBuYW1lKCkKKyAgICB7Cisg ICAgICAgIEFTU0VSVChtX3R5cGUgPT0gU3RhcnRUYWcgfHwgbV90eXBlID09IEVuZFRhZyB8fCBt X3R5cGUgPT0gRE9DVFlQRSk7CisgICAgICAgIHJldHVybiBBdG9taWNTdHJpbmcoU3RyaW5nSW1w bDo6YWRvcHQobV9kYXRhKSk7CisgICAgfQorCisgICAgYm9vbCBzZWxmQ2xvc2luZygpIGNvbnN0 CisgICAgeworICAgICAgICBBU1NFUlQobV90eXBlID09IFN0YXJ0VGFnIHx8IG1fdHlwZSA9PSBF bmRUYWcpOworICAgICAgICByZXR1cm4gbV9zZWxmQ2xvc2luZzsKKyAgICB9CisKKyAgICBOYW1l ZE1hcHBlZEF0dHJNYXAqIGF0dHJzKCkgY29uc3QKKyAgICB7CisgICAgICAgIEFTU0VSVChtX3R5 cGUgPT0gU3RhcnRUYWcgfHwgbV90eXBlID09IEVuZFRhZyk7CisgICAgICAgIHJldHVybiBtX2F0 dHJzLmdldCgpOwogICAgIH0KIAogcHJpdmF0ZToKICAgICBUeXBlIG1fdHlwZTsKIAotICAgIC8v IEZvciBET0NUWVBFIGFuZCBTdGFydFRhZwotICAgIFN0cmluZyBtX25hbWU7CisgICAgLy8gIm5h bWUiIGZvciBET0NUWVBFLCBTdGFydFRhZywgYW5kIEVuZFRhZworICAgIC8vICJjaGFyYWN0ZXJz IiBmb3IgQ2hhcmFjdGVyCisgICAgLy8gImRhdGEiIGZvciBDb21tZW50CisgICAgV1RGOjpWZWN0 b3I8VUNoYXIsIDEwMjQ+IG1fZGF0YTsKIAogICAgIC8vIEZvciBET0NUWVBFCiAgICAgU3RyaW5n IG1fcHVibGljSWRlbnRpZmllcjsKQEAgLTcwLDEzICsxMDYsNyBAQCBwcml2YXRlOgogCiAgICAg Ly8gRm9yIFN0YXJ0VGFnIGFuZCBFbmRUYWcKICAgICBib29sIG1fc2VsZkNsb3Npbmc7Ci0gICAg UmVmUHRyPE5hbWVkTWFwcGVkQXR0ck1hcD4gYXR0cnM7Ci0KLSAgICAvLyBGb3IgQ2hhcmFjdGVy Ci0gICAgVUNoYXIgbV9jaGFyYWN0ZXI7Ci0KLSAgICAvLyBGb3IgQ29tbWVudAotICAgIFN0cmlu ZyBtX2RhdGE7CisgICAgUmVmUHRyPE5hbWVkTWFwcGVkQXR0ck1hcD4gbV9hdHRyczsKIH07CiAK IH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAgYi9XZWJDb3Jl L2h0bWwvSFRNTDVUb2tlbml6ZXIuY3BwCmluZGV4IDBhOGQxNzIyNWI2ZjcxYjMyMzBlNDFiMzBm ZWIzYmYzYzAwMTI1ZTAuLjZhNDMyNDY2MmM4MDcyZWZkMjg1ZDA4ZTJmOWM0YjMxMzgxMmFmYzYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUw1VG9rZW5pemVyLmNwcApAQCAtMzAsMTAgKzMwLDI2IEBACiAjaW5jbHVkZSAi SFRNTDVUb2tlbi5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5oIgogI2luY2x1ZGUgIkhUTUxQ YXJzZXIuaCIKKyNpbmNsdWRlICJIVE1MVG9rZW5pemVyLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVt ZW50ZWQuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgdm9pZCBjb252ZXJ0VG9P bGRTdHlsZShIVE1MNVRva2VuJiB0b2tlbiwgVG9rZW4mIG9sZFN0eWxlVG9rZW4pCit7CisgICAg c3dpdGNoICh0b2tlbi50eXBlKCkpIHsKKyAgICBjYXNlIEhUTUw1VG9rZW46OlN0YXJ0VGFnOgor ICAgIGNhc2UgSFRNTDVUb2tlbjo6RW5kVGFnOgorICAgICAgICBvbGRTdHlsZVRva2VuLmJlZ2lu VGFnID0gKHRva2VuLnR5cGUoKSA9PSBIVE1MNVRva2VuOjpTdGFydFRhZyk7CisgICAgICAgIG9s ZFN0eWxlVG9rZW4uc2VsZkNsb3NpbmdUYWcgPSB0b2tlbi5zZWxmQ2xvc2luZygpOworICAgICAg ICBvbGRTdHlsZVRva2VuLnRhZ05hbWUgPSB0b2tlbi5uYW1lKCk7CisgICAgICAgIG9sZFN0eWxl VG9rZW4uYXR0cnMgPSB0b2tlbi5hdHRycygpOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0 OgorICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIH0KK30KKwogSFRNTDVUb2tlbml6ZXI6 OkhUTUw1VG9rZW5pemVyKEhUTUxEb2N1bWVudCogZG9jLCBib29sIHJlcG9ydEVycm9ycykKICAg ICA6IFRva2VuaXplcigpCiAgICAgLCBtX2RvYyhkb2MpCkBAIC02NCw2ICs4MCwxNCBAQCB2b2lk IEhUTUw1VG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgYm9v bCkKICAgICAgICAgLy8gc2VwYXJhdGlvbiBiZXR3ZWVuIHRoZSBwYXJzZXIgbG9naWMgYW5kIHRv a2VuaXplciBsb2dpYyBsaWtlCiAgICAgICAgIC8vIHRoZSBIVE1MNSBjb2RlcGF0aCBzaG91bGQu ICBUaGUgY2FsbCBzaG91bGQgbG9vayBzb21ldGhpbmcgbGlrZToKICAgICAgICAgLy8gbV9wYXJz ZXItPmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4odG9rZW4pOworICAgICAgICAvLyBGb3Igbm93LCB3 ZSB0cmFuc2xhdGUgaW50byBhbiBvbGQtc3R5bGUgdG9rZW4gZm9yIHRlc3RpbmcuCisgICAgICAg IGlmICh0b2tlbi50eXBlKCkgPT0gSFRNTDVUb2tlbjo6VW5pbml0aWFsaXplZCkgeworICAgICAg ICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9 CisgICAgICAgIFRva2VuIG9sZFN0eWxlVG9rZW47CisgICAgICAgIGNvbnZlcnRUb09sZFN0eWxl KHRva2VuLCBvbGRTdHlsZVRva2VuKTsKKyAgICAgICAgbV9wYXJzZXItPnBhcnNlVG9rZW4oJm9s ZFN0eWxlVG9rZW4pOwogICAgIH0KIH0KIAo=