189268 2018-09-04 12:07:27 -0700 Make the jsc shell print, printErr, and debug functions more robust. 2018-09-04 12:50:03 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam webkit-bug-importer oldest_to_newest 1456406 0 mark.lam 2018-09-04 12:07:27 -0700 We'll now check for UTF8 conversion errors. <rdar://problem/41192690> 1456407 1 348836 mark.lam 2018-09-04 12:11:13 -0700 Created attachment 348836 proposed patch. 1456408 2 348836 mark.lam 2018-09-04 12:13:16 -0700 Comment on attachment 348836 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=348836&action=review > Source/JavaScriptCore/jsc.cpp:1030 > + scope.throwException(exec, createError(exec, "Source exhausted encountered during UTF8 conversion")); I should remove the "encountered" here. 1456415 3 348836 keith_miller 2018-09-04 12:20:07 -0700 Comment on attachment 348836 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=348836&action=review r=me. >> Source/JavaScriptCore/jsc.cpp:1030 >> + scope.throwException(exec, createError(exec, "Source exhausted encountered during UTF8 conversion")); > > I should remove the "encountered" here. What does SourceExhausted error actually mean anyway? 1456420 4 mark.lam 2018-09-04 12:46:55 -0700 (In reply to Keith Miller from comment #3) > What does SourceExhausted error actually mean anyway? From convertUTF8ToUTF16() in UTF8.cpp, I think it means that a multi-byte encoding got cut off (i.e. missing bytes). 1456422 5 mark.lam 2018-09-04 12:49:10 -0700 Thanks for the review. Landed in r235627: <http://trac.webkit.org/r235627>. 348836 2018-09-04 12:11:13 -0700 2018-09-04 12:20:07 -0700 proposed patch. bug-189268.patch text/plain 3423 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM1NjI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE4LTA5LTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN YWtlIHRoZSBqc2Mgc2hlbGwgcHJpbnQsIHByaW50RXJyLCBhbmQgZGVidWcgZnVuY3Rpb25zIG1v cmUgcm9idXN0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg5MjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTE5MjY5MD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSdsbCBub3cgY2hlY2sgZm9y IFVURjggY29udmVyc2lvbiBlcnJvcnMuCisKKyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAo Y1N0cmluZ0Zyb21WaWV3V2l0aFN0cmluZyk6CisgICAgICAgIChwcmludEludGVybmFsKToKKyAg ICAgICAgKGZ1bmN0aW9uRGVidWcpOgorCiAyMDE4LTA5LTA0ICBNaWNoYWVsIENhdGFuemFybyAg PG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIEFkZCBtb3JlIHVu dXNlZCByZXN1bHQgd2FybmluZ3MgdG8gSlNDIEFQSQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJ KHJldmlzaW9uIDIzNTYxMykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKICAqICBDb3B5cmlnaHQgKEMpIDE5OTktMjAw MCBIYXJyaSBQb3J0ZW4gKHBvcnRlbkBrZGUub3JnKQotICogIENvcHlyaWdodCAoQykgMjAwNC0y MDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqICBDb3B5cmlnaHQgKEMpIDIw MDQtMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiAgQ29weXJpZ2h0IChD KSAyMDA2IEJqb2VybiBHcmFmIChiam9lcm4uZ3JhZkBnbWFpbC5jb20pCiAgKgogICogIFRoaXMg bGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IK QEAgLTEwMTQsNiArMTAxNCwyNyBAQCBKU09iamVjdCogR2xvYmFsT2JqZWN0Ojptb2R1bGVMb2Fk ZXJDcmVhCiAgICAgcmV0dXJuIG1ldGFQcm9wZXJ0aWVzOwogfQogCitzdGF0aWMgQ1N0cmluZyBj U3RyaW5nRnJvbVZpZXdXaXRoU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgVGhyb3dTY29wZSYgc2Nv cGUsIFN0cmluZ1ZpZXdXaXRoVW5kZXJseWluZ1N0cmluZyYgdmlld1dpdGhTdHJpbmcpCit7Cisg ICAgRXhwZWN0ZWQ8Q1N0cmluZywgVVRGOENvbnZlcnNpb25FcnJvcj4gZXhwZWN0ZWRTdHJpbmcg PSB2aWV3V2l0aFN0cmluZy52aWV3LnRyeUdldFV0ZjgoKTsKKyAgICBpZiAoZXhwZWN0ZWRTdHJp bmcpCisgICAgICAgIHJldHVybiBleHBlY3RlZFN0cmluZy52YWx1ZSgpOworICAgIHN3aXRjaCAo ZXhwZWN0ZWRTdHJpbmcuZXJyb3IoKSkgeworICAgIGNhc2UgVVRGOENvbnZlcnNpb25FcnJvcjo6 T3V0T2ZNZW1vcnk6CisgICAgICAgIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVjLCBzY29wZSk7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgVVRGOENvbnZlcnNpb25FcnJvcjo6SWxsZWdhbFNv dXJjZToKKyAgICAgICAgc2NvcGUudGhyb3dFeGNlcHRpb24oZXhlYywgY3JlYXRlRXJyb3IoZXhl YywgIklsbGVnYWwgc291cmNlIGVuY291bnRlcmVkIGR1cmluZyBVVEY4IGNvbnZlcnNpb24iKSk7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgVVRGOENvbnZlcnNpb25FcnJvcjo6U291cmNlRXho YXVzdGVkOgorICAgICAgICBzY29wZS50aHJvd0V4Y2VwdGlvbihleGVjLCBjcmVhdGVFcnJvcihl eGVjLCAiU291cmNlIGV4aGF1c3RlZCBlbmNvdW50ZXJlZCBkdXJpbmcgVVRGOCBjb252ZXJzaW9u IikpOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBSRUxFQVNFX0FTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKyAgICByZXR1cm4geyB9OworfQorCiBzdGF0aWMgRW5j b2RlZEpTVmFsdWUgcHJpbnRJbnRlcm5hbChFeGVjU3RhdGUqIGV4ZWMsIEZJTEUqIG91dCkKIHsK ICAgICBWTSYgdm0gPSBleGVjLT52bSgpOwpAQCAtMTAzNCw3ICsxMDU1LDkgQEAgc3RhdGljIEVu Y29kZWRKU1ZhbHVlIHByaW50SW50ZXJuYWwoRXhlYwogCiAgICAgICAgIGF1dG8gdmlld1dpdGhT dHJpbmcgPSBleGVjLT51bmNoZWNrZWRBcmd1bWVudChpKS50b1N0cmluZyhleGVjKS0+dmlld1dp dGhVbmRlcmx5aW5nU3RyaW5nKGV4ZWMpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKLSAgICAgICAgaWYgKGZwcmludGYob3V0LCAiJXMiLCB2 aWV3V2l0aFN0cmluZy52aWV3LnV0ZjgoKS5kYXRhKCkpIDwgMCkKKyAgICAgICAgYXV0byBzdHJp bmcgPSBjU3RyaW5nRnJvbVZpZXdXaXRoU3RyaW5nKGV4ZWMsIHNjb3BlLCB2aWV3V2l0aFN0cmlu Zyk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkp OworICAgICAgICBpZiAoZnByaW50ZihvdXQsICIlcyIsIHN0cmluZy5kYXRhKCkpIDwgMCkKICAg ICAgICAgICAgIGdvdG8gZmFpbDsKICAgICB9CiAKQEAgLTEwNTMsNyArMTA3Niw5IEBAIEVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25EZWIKICAgICBhdXRvIHNjb3BlID0gREVD TEFSRV9USFJPV19TQ09QRSh2bSk7CiAgICAgYXV0byB2aWV3V2l0aFN0cmluZyA9IGV4ZWMtPmFy Z3VtZW50KDApLnRvU3RyaW5nKGV4ZWMpLT52aWV3V2l0aFVuZGVybHlpbmdTdHJpbmcoZXhlYyk7 CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7Ci0gICAg ZnByaW50ZihzdGRlcnIsICItLT4gJXNcbiIsIHZpZXdXaXRoU3RyaW5nLnZpZXcudXRmOCgpLmRh dGEoKSk7CisgICAgYXV0byBzdHJpbmcgPSBjU3RyaW5nRnJvbVZpZXdXaXRoU3RyaW5nKGV4ZWMs IHNjb3BlLCB2aWV3V2l0aFN0cmluZyk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgZnByaW50ZihzdGRlcnIsICItLT4gJXNcbiIsIHN0cmlu Zy5kYXRhKCkpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9 CiAK