126202 2013-12-23 19:25:54 -0800 Line ending conversion should be able to handle strings with null chars 2014-01-03 10:56:12 -0800 1 1 1 Unclassified WebKit XML 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa ap ap commit-queue oldest_to_newest 962699 0 rniwa 2013-12-23 19:25:54 -0800 Consider merging https://chromium.googlesource.com/chromium/blink/+/7540d33136b1f04a01ce35209aab7ec0928a2fe6 Currently the line ending normalization functions returns an empty string when a string including null characters is given. This CL fixes the behavior. The attached test case fails on WebKit. 964160 1 220319 ap 2014-01-03 10:27:28 -0800 Created attachment 220319 merge 964175 2 220319 commit-queue 2014-01-03 10:56:10 -0800 Comment on attachment 220319 merge Clearing flags on attachment: 220319 Committed r161269: <http://trac.webkit.org/changeset/161269> 964176 3 commit-queue 2014-01-03 10:56:12 -0800 All reviewed patches have been landed. Closing bug. 220319 2014-01-03 10:27:28 -0800 2014-01-03 10:56:10 -0800 merge null.txt text/plain 6053 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTI2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAxLTAzICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIExpbmUgZW5kaW5nIGNvbnZl cnNpb24gc2hvdWxkIGJlIGFibGUgdG8gaGFuZGxlIHN0cmluZ3Mgd2l0aCBudWxsIGNoYXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYyMDIKKwor ICAgICAgICBUaGlzIGlzIGEgbWVyZ2UgZnJvbSBCbGluay4KKworICAgICAgICBSZXZpZXdlZCBi eSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvbG9jYWwv Zm9ybWRhdGEvc2VuZC1mb3JtLWRhdGEtd2l0aC1zdHJpbmctY29udGFpbmluZy1udWxsLmh0bWwK KworICAgICAgICAqIHBsYXRmb3JtL3RleHQvTGluZUVuZGluZy5jcHA6IChXZWJDb3JlOjpub3Jt YWxpemVUb0NST3JMRik6IERvIGl0IHJpZ2h0LgorCiAyMDE0LTAxLTAzICBwZWF2b0BvdXRsb29r LmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gQ29tcGlsZSBl cnJvci4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTGluZUVuZGluZy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9MaW5lRW5kaW5nLmNw cAkocmV2aXNpb24gMTYxMjA5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9MaW5l RW5kaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDcgKzEwMSw4IEBAIHZvaWQgaW50ZXJu YWxOb3JtYWxpemVMaW5lRW5kaW5nc1RvQ1JMRigKICAgICAvLyBDb21wdXRlIHRoZSBuZXcgbGVu Z3RoLgogICAgIHNpemVfdCBuZXdMZW4gPSAwOwogICAgIGNvbnN0IGNoYXIqIHAgPSBmcm9tLmRh dGEoKTsKLSAgICB3aGlsZSAoY2hhciBjID0gKnArKykgeworICAgIHdoaWxlIChwIDwgZnJvbS5k YXRhKCkgKyBmcm9tLmxlbmd0aCgpKSB7CisgICAgICAgIGNoYXIgYyA9ICpwKys7CiAgICAgICAg IGlmIChjID09ICdccicpIHsKICAgICAgICAgICAgIC8vIFNhZmUgdG8gbG9vayBhaGVhZCBiZWNh dXNlIG9mIHRyYWlsaW5nICdcMCcuCiAgICAgICAgICAgICBpZiAoKnAgIT0gJ1xuJykgewpAQCAt MTI4LDcgKzEyOSw4IEBAIHZvaWQgaW50ZXJuYWxOb3JtYWxpemVMaW5lRW5kaW5nc1RvQ1JMRigK ICAgICBjaGFyKiBxID0gYnVmZmVyLmFsbG9jYXRlKG5ld0xlbik7CiAKICAgICAvLyBNYWtlIGEg Y29weSBvZiB0aGUgc3RyaW5nLgotICAgIHdoaWxlIChjaGFyIGMgPSAqcCsrKSB7CisgICAgd2hp bGUgKHAgPCBmcm9tLmRhdGEoKSArIGZyb20ubGVuZ3RoKCkpIHsKKyAgICAgICAgY2hhciBjID0g KnArKzsKICAgICAgICAgaWYgKGMgPT0gJ1xyJykgewogICAgICAgICAgICAgLy8gU2FmZSB0byBs b29rIGFoZWFkIGJlY2F1c2Ugb2YgdHJhaWxpbmcgJ1wwJy4KICAgICAgICAgICAgIGlmICgqcCAh PSAnXG4nKSB7CkBAIC0xNjIsNyArMTY0LDggQEAgdm9pZCBub3JtYWxpemVUb0NST3JMRihjb25z dCBDU3RyaW5nJiBmcgogICAgIGNvbnN0IGNoYXIqIHAgPSBmcm9tLmRhdGEoKTsKICAgICBjaGFy IGZyb21FbmRpbmdDaGFyID0gdG9DUiA/ICdcbicgOiAnXHInOwogICAgIGNoYXIgdG9FbmRpbmdD aGFyID0gdG9DUiA/ICdccicgOiAnXG4nOwotICAgIHdoaWxlIChjaGFyIGMgPSAqcCsrKSB7Cisg ICAgd2hpbGUgKHAgPCBmcm9tLmRhdGEoKSArIGZyb20ubGVuZ3RoKCkpIHsKKyAgICAgICAgY2hh ciBjID0gKnArKzsKICAgICAgICAgaWYgKGMgPT0gJ1xyJyAmJiAqcCA9PSAnXG4nKSB7CiAgICAg ICAgICAgICAvLyBUdXJuIENSTEYgaW50byBDUiBvciBMRi4KICAgICAgICAgICAgIHArKzsKQEAg LTE4Nyw3ICsxOTAsOCBAQCB2b2lkIG5vcm1hbGl6ZVRvQ1JPckxGKGNvbnN0IENTdHJpbmcmIGZy CiAgICAgfQogCiAgICAgLy8gTWFrZSBhIGNvcHkgb2YgdGhlIHN0cmluZy4KLSAgICB3aGlsZSAo Y2hhciBjID0gKnArKykgeworICAgIHdoaWxlIChwIDwgZnJvbS5kYXRhKCkgKyBmcm9tLmxlbmd0 aCgpKSB7CisgICAgICAgIGNoYXIgYyA9ICpwKys7CiAgICAgICAgIGlmIChjID09ICdccicgJiYg KnAgPT0gJ1xuJykgewogICAgICAgICAgICAgLy8gVHVybiBDUkxGIG9yIENSIGludG8gQ1Igb3Ig TEYuCiAgICAgICAgICAgICBwKys7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjEyNjYpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0w MS0wMyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5l IGVuZGluZyBjb252ZXJzaW9uIHNob3VsZCBiZSBhYmxlIHRvIGhhbmRsZSBzdHJpbmdzIHdpdGgg bnVsbCBjaGFycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI2MjAyCisKKyAgICAgICAgVGhpcyBpcyBhIG1lcmdlIGZyb20gQmxpbmsuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICAqIGh0dHAvdGVz dHMvbG9jYWwvZm9ybWRhdGEvc2VuZC1mb3JtLWRhdGEtd2l0aC1zdHJpbmctY29udGFpbmluZy1u dWxsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9sb2NhbC9mb3Jt ZGF0YS9zZW5kLWZvcm0tZGF0YS13aXRoLXN0cmluZy1jb250YWluaW5nLW51bGwuaHRtbDogQWRk ZWQuCisKIDIwMTQtMDEtMDMgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4KSW5kZXg6IExheW91dFRlc3RzL2h0 dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvc2VuZC1mb3JtLWRhdGEtd2l0aC1zdHJpbmctY29udGFp bmluZy1udWxsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2xvY2FsL2Zvcm1kYXRhL3NlbmQtZm9ybS1kYXRhLXdpdGgtc3RyaW5nLWNvbnRhaW5pbmct bnVsbC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2xvY2FsL2Zvcm1kYXRhL3NlbmQtZm9ybS1kYXRhLXdpdGgtc3RyaW5nLWNvbnRhaW5pbmctbnVs bC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMCBAQAorVGVzdCB0aGF0 IHdlIGNhbiBzZW5kIHRleHRhcmVhIGRhdGEgY29udGFpbmluZyBudWxsIGNoYXJhY3RlcnMuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHRoZSBzdHJpbmcgY29udGFpbmlu ZyBhIG51bGwgYnl0ZSBpcyBlY2hvZWQgY29ycmVjdGx5LgorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91 dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvc2VuZC1mb3JtLWRhdGEtd2l0aC1zdHJp bmctY29udGFpbmluZy1udWxsLWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWlt ZS10eXBlCiMjIC0wLDAgKzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBw cm9wZXJ0eQpBZGRlZDogc3ZuOmVvbC1zdHlsZQojIyAtMCwwICsxICMjCituYXRpdmUKXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9s b2NhbC9mb3JtZGF0YS9zZW5kLWZvcm0tZGF0YS13aXRoLXN0cmluZy1jb250YWluaW5nLW51bGwu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsL2Zvcm1kYXRh L3NlbmQtZm9ybS1kYXRhLXdpdGgtc3RyaW5nLWNvbnRhaW5pbmctbnVsbC5odG1sCShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9zZW5kLWZvcm0t ZGF0YS13aXRoLXN0cmluZy1jb250YWluaW5nLW51bGwuaHRtbAkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDM3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8c2NyaXB0IHNy Yz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQ+CitkZXNjcmlwdGlvbigiVGVzdCB0aGF0IHdlIGNhbiBzZW5kIHRleHRhcmVhIGRhdGEgY29u dGFpbmluZyBudWxsIGNoYXJhY3RlcnMuIik7CisKK2Z1bmN0aW9uIHJ1blRlc3QoKQoreworICAg IC8vIFdlIGNhbid0IHVzZSB0ZXN0U2VuZGluZ0Zvcm1EYXRhIGJlY2F1c2UgUEhQIGVzY2FwZXMK KyAgICAvLyBudWxsIGJ5dGVzIG9uIFdpbmRvd3MuCisgICAgdmFyIHhociA9IG5ldyBYTUxIdHRw UmVxdWVzdCgpOworICAgIHhoci5vcGVuKCdQT1NUJywgJ2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC94 bWxodHRwcmVxdWVzdC9yZXNvdXJjZXMvcG9zdC1lY2hvLmNnaScsIGZhbHNlKTsKKyAgICB2YXIg Zm9ybURhdGEgPSBuZXcgRm9ybURhdGEoKTsKKyAgICBmb3JtRGF0YS5hcHBlbmQoJ3RleHRhcmVh JywgJ2hlbGxvXHUwMDAwd29ybGQnKTsKKyAgICB4aHIuc2VuZChmb3JtRGF0YSk7CisgICAgaWYg KHhoci5yZWFkeVN0YXRlICE9PSA0IHx8IHhoci5zdGF0dXMgIT09IDIwMCkgeworICAgICAgICB0 ZXN0RmFpbGVkKCd4aHIucmVhZHlTdGF0ZSA9ICcgKyB4aHIucmVhZHlTdGF0ZSArICcsIHhoci5z dGF0dXMgPSAnICsgeGhyLnN0YXR1cyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYg KHhoci5yZXNwb25zZS5pbmRleE9mKCduYW1lPSJ0ZXh0YXJlYSJcclxuXHJcbmhlbGxvXHUwMDAw d29ybGQnKSA+PSAwKSB7CisgICAgICAgIHRlc3RQYXNzZWQoJ3RoZSBzdHJpbmcgY29udGFpbmlu ZyBhIG51bGwgYnl0ZSBpcyBlY2hvZWQgY29ycmVjdGx5LicpOworICAgIH0gZWxzZSB7CisgICAg ICAgIHRlc3RGYWlsZWQoJ3RoZSBzdHJpbmcgY29udGFpbmluZyBhIG51bGwgYnl0ZSBpcyBub3Qg ZWNob2VkIGNvcnJlY3RseS4nKTsKKyAgICB9Cit9CisKK2lmICh3aW5kb3cuZXZlbnRTZW5kZXIp IHsKKyAgICBydW5UZXN0KCk7Cit9IGVsc2UgeworICAgIHRlc3RGYWlsZWQoIlRoaXMgdGVzdCBp cyBub3QgaW50ZXJhY3RpdmUsIHBsZWFzZSBydW4gaW4gYSB0ZXN0aW5nIGVudmlyb25tZW50LiIp OworfQorCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KClByb3BlcnR5IGNoYW5n ZXMgb246IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvc2VuZC1mb3JtLWRh dGEtd2l0aC1zdHJpbmctY29udGFpbmluZy1udWxsLmh0bWwKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3Zu Om1pbWUtdHlwZQojIyAtMCwwICsxICMjCit0ZXh0L2h0bWwKXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBwcm9wZXJ0eQo=