6345 2006-01-03 00:47:11 -0800 REGRESSION: repro crash when specifying an invalid value for the charset attribute of a <script> 2006-01-31 21:20:53 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 VERIFIED FIXED http://www.mooma.com/ P1 Normal --- 1 mitz eric ap eric oldest_to_newest 27562 0 mitz 2006-01-03 00:47:11 -0800 Safari crashes if the charset attribute in a <script> tag, (or the document's charset, if the script tag doesn't specify a charset) is not a valid encoding name. The crash is because ChachedScript's m_codec is null. To reproduce, open the attached testcase in Safari. The regression is from the patch for bug 6078, which replaced a few instances of KGlobal::charsets()- >codecForName() with QTextCodec::codecForName(). The former defaults to ISO-8859-1 when the argument is invalid, but the latter returns 0. 27563 1 5438 mitz 2006-01-03 00:48:03 -0800 Created attachment 5438 testcase (crasher) 27613 2 eric 2006-01-03 11:31:50 -0800 I've got a fix. 27614 3 5454 eric 2006-01-03 11:44:24 -0800 Created attachment 5454 The fix (with a small amount of unrelated cleanup) 27615 4 5454 eric 2006-01-03 11:46:28 -0800 Comment on attachment 5454 The fix (with a small amount of unrelated cleanup) Note, this fixes 2 of the 3 places I changed from KCharsets::codecForName to QTextCodec::codecForName. The 3rd case (found in khtml/html/html_formimpl.cpp), I didn't change. The code there seems to *expect* that codec for name might return NULL, where has KCharset::codecForName never returned NULL. It seems that if the first charset listed was "invalid" we would assume the page was supposed to be latin1, now we (hopefully correctly) go through the entire list, looking for a valid charset first. 27634 5 5454 eric 2006-01-03 12:32:38 -0800 Comment on attachment 5454 The fix (with a small amount of unrelated cleanup) The reason I didn't add a test for the accept-charset related change (which was made by the previous bug, and is now being noticed when going to fix this crash) is that I don't know how to go about testing local form submissions in DRT. 27640 6 ap 2006-01-03 13:36:32 -0800 I made a test for encodings in submitted forms which is now in fast/forms/form-data-encoding.html - not sure if the same approach can be used here, though. 27643 7 5454 darin 2006-01-03 13:44:51 -0800 Comment on attachment 5454 The fix (with a small amount of unrelated cleanup) Looks fine. 29401 8 joost 2006-01-22 04:57:12 -0800 Removing keyword(s) since bug is fixed. 29424 9 joost 2006-01-22 05:01:27 -0800 Removing keyword(s) since bug is fixed. 30889 10 eric 2006-01-31 21:20:53 -0800 Removing Regression keyword from bugs already fixed. 5438 2006-01-03 00:48:03 -0800 2006-01-03 00:48:03 -0800 testcase (crasher) badScriptCharset.html text/html 127 mitz PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iaHR0cDovL2ltYWdlcy5hcHBsZS5j b20vbWFpbi9qcy9zX2NvZGVfcmVtb3RlLmpzIiBjaGFyc2V0PSJpbnZhbGlkLWVuY29kaW5nLW5h bWUiPjwvc2NyaXB0Pg== 5454 2006-01-03 11:44:24 -0800 2006-01-03 13:44:51 -0800 The fix (with a small amount of unrelated cleanup) fix.patch text/plain 6290 eric SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ludmFsaWQtY2hhcnNldC1vbi1zY3JpcHQt Y3Jhc2hlcy1sb2FkZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IGludmFsaWQt Y2hhcnNldC1vbi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXItZXhwZWN0ZWQudHh0CmRpZmYgLU4gTGF5 b3V0VGVzdHMvZmFzdC9sb2FkZXIvaW52YWxpZC1jaGFyc2V0LW9uLXNjcmlwdC1jcmFzaGVzLWxv YWRlci1leHBlY3RlZC50eHQKLS0tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ludmFsaWQtY2hh cnNldC1vbi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXItZXhwZWN0ZWQudHh0CTEgSmFuIDE5NzAgMDA6 MDA6MDAgLTAwMDAKKysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ludmFsaWQtY2hhcnNldC1v bi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXItZXhwZWN0ZWQudHh0CTMgSmFuIDIwMDYgMTk6NDQ6MzAg LTAwMDAKQEAgLTAsMCArMSBAQAorU3VjY2VzcyEKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9h ZGVyL2ludmFsaWQtY2hhcnNldC1vbi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXIuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09ClJDUyBmaWxlOiBpbnZhbGlkLWNoYXJzZXQtb24tc2NyaXB0LWNyYXNoZXMtbG9hZGVyLmh0 bWwKZGlmZiAtTiBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9pbnZhbGlkLWNoYXJzZXQtb24tc2Ny aXB0LWNyYXNoZXMtbG9hZGVyLmh0bWwKLS0tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2ludmFs aWQtY2hhcnNldC1vbi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXIuaHRtbAkxIEphbiAxOTcwIDAwOjAw OjAwIC0wMDAwCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9pbnZhbGlkLWNoYXJzZXQtb24t c2NyaXB0LWNyYXNoZXMtbG9hZGVyLmh0bWwJMyBKYW4gMjAwNiAxOTo0NDozMCAtMDAwMApAQCAt MCwwICsxLDIgQEAKKzx0aXRsZT5UZXN0Y2FzZSBmb3IgNjM0NTwvdGl0bGU+Cis8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJyZXNvdXJjZXMvaW52YWxpZC1jaGFyc2V0LW9uLXNj cmlwdC1jcmFzaGVzLWxvYWRlci5qcyIgY2hhcnNldD0iaW52YWxpZC1lbmNvZGluZy1uYW1lIj48 L3NjcmlwdD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3Jlc291cmNlcy9pbnZhbGlk LWNoYXJzZXQtb24tc2NyaXB0LWNyYXNoZXMtbG9hZGVyLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6 IHJlc291cmNlcy9pbnZhbGlkLWNoYXJzZXQtb24tc2NyaXB0LWNyYXNoZXMtbG9hZGVyLmpzCmRp ZmYgLU4gTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvcmVzb3VyY2VzL2ludmFsaWQtY2hhcnNldC1v bi1zY3JpcHQtY3Jhc2hlcy1sb2FkZXIuanMKLS0tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3Jl c291cmNlcy9pbnZhbGlkLWNoYXJzZXQtb24tc2NyaXB0LWNyYXNoZXMtbG9hZGVyLmpzCTEgSmFu IDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3Jlc291cmNl cy9pbnZhbGlkLWNoYXJzZXQtb24tc2NyaXB0LWNyYXNoZXMtbG9hZGVyLmpzCTMgSmFuIDIwMDYg MTk6NDQ6MzAgLTAwMDAKQEAgLTAsMCArMSwzIEBACitpZiAod2luZG93LmxheW91dFRlc3RDb250 cm9sbGVyKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKK2RvY3VtZW50 LndyaXRlbG4oIlN1Y2Nlc3MhIik7CkluZGV4OiBXZWJDb3JlL2todG1sL2h0bWwvaHRtbF9mb3Jt aW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvaHRt bC9odG1sX2Zvcm1pbXBsLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMTkKZGlmZiAtcCAt dSAtcjEuMjE5IFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcAotLS0gV2ViQ29y ZS9raHRtbC9odG1sL2h0bWxfZm9ybWltcGwuY3BwCTMgSmFuIDIwMDYgMDg6MTI6MjcgLTAwMDAJ MS4yMTkKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcAkzIEphbiAyMDA2 IDE5OjQ0OjU1IC0wMDAwCkBAIC0zMDcsMTcgKzMwNywxNSBAQCBib29sIEhUTUxGb3JtRWxlbWVu dEltcGw6OmZvcm1EYXRhKEZvcm1ECiAgICAgUVN0cmluZ0xpc3QgY2hhcnNldHMgPSBRU3RyaW5n TGlzdDo6c3BsaXQoJyAnLCBzdHIpOwogICAgIFFUZXh0Q29kZWMqIGNvZGVjID0gMDsKICAgICBL SFRNTFBhcnQgKnBhcnQgPSBnZXREb2N1bWVudCgpLT5wYXJ0KCk7Ci0gICAgZm9yICggUVN0cmlu Z0xpc3Q6Okl0ZXJhdG9yIGl0ID0gY2hhcnNldHMuYmVnaW4oKTsgaXQgIT0gY2hhcnNldHMuZW5k KCk7ICsraXQgKQotICAgIHsKKyAgICBmb3IgKFFTdHJpbmdMaXN0OjpJdGVyYXRvciBpdCA9IGNo YXJzZXRzLmJlZ2luKCk7IGl0ICE9IGNoYXJzZXRzLmVuZCgpOyArK2l0KSB7CiAgICAgICAgIFFT dHJpbmcgZW5jID0gKCppdCk7Ci0gICAgICAgIGlmKGVuYy5jb250YWlucygiVU5LTk9XTiIpKQot ICAgICAgICB7CisgICAgICAgIGlmIChlbmMuY29udGFpbnMoIlVOS05PV04iKSkgewogICAgICAg ICAgICAgLy8gdXNlIHN0YW5kYXJkIGRvY3VtZW50IGVuY29kaW5nCiAgICAgICAgICAgICBlbmMg PSAiSVNPLTg4NTktMSI7CiAgICAgICAgICAgICBpZiAocGFydCkKICAgICAgICAgICAgICAgICBl bmMgPSBwYXJ0LT5lbmNvZGluZygpOwogICAgICAgICB9Ci0gICAgICAgIGlmKChjb2RlYyA9IFFU ZXh0Q29kZWM6OmNvZGVjRm9yTmFtZShlbmMubGF0aW4xKCkpKSkKKyAgICAgICAgaWYgKChjb2Rl YyA9IFFUZXh0Q29kZWM6OmNvZGVjRm9yTmFtZShlbmMubGF0aW4xKCkpKSkKICAgICAgICAgICAg IGJyZWFrOwogICAgIH0KIApJbmRleDogV2ViQ29yZS9raHRtbC9taXNjL2xvYWRlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvbWlzYy9sb2FkZXIuY3Bw LHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjg1CmRpZmYgLXAgLXUgLXIxLjg1IFdlYkNvcmUva2h0 bWwvbWlzYy9sb2FkZXIuY3BwCi0tLSBXZWJDb3JlL2todG1sL21pc2MvbG9hZGVyLmNwcAkyOCBE ZWMgMjAwNSAxODo0NjoyMyAtMDAwMAkxLjg1CisrKyBXZWJDb3JlL2todG1sL21pc2MvbG9hZGVy LmNwcAkzIEphbiAyMDA2IDE5OjQ0OjU3IC0wMDAwCkBAIC0xNjAsMTYgKzE2MCwxNiBAQCB2b2lk IENhY2hlZE9iamVjdDo6c2V0U2l6ZShpbnQgc2l6ZSkKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAogQ2FjaGVkQ1NTU3R5bGVTaGVldDo6Q2FjaGVkQ1NTU3R5bGVTaGVl dChEb2NMb2FkZXIqIGRsLCBjb25zdCBET01TdHJpbmcgJnVybCwgS0lPOjpDYWNoZUNvbnRyb2wg X2NhY2hlUG9saWN5LCB0aW1lX3QgX2V4cGlyZURhdGUsIGNvbnN0IFFTdHJpbmcmIGNoYXJzZXQp Ci0gICAgOiBDYWNoZWRPYmplY3QodXJsLCBDU1NTdHlsZVNoZWV0LCBfY2FjaGVQb2xpY3ksIF9l eHBpcmVEYXRlKQorICAgIDogQ2FjaGVkT2JqZWN0KHVybCwgQ1NTU3R5bGVTaGVldCwgX2NhY2hl UG9saWN5LCBfZXhwaXJlRGF0ZSksIG1fY29kZWMoMCkKIHsKICAgICAvLyBJdCdzIGNzcyB3ZSB3 YW50LgotICAgIHNldEFjY2VwdCggUVN0cmluZzo6ZnJvbUxhdGluMSgidGV4dC9jc3MiKSApOwor ICAgIHNldEFjY2VwdCgidGV4dC9jc3MiKTsKICAgICAvLyBsb2FkIHRoZSBmaWxlCiAgICAgQ2Fj aGU6OmxvYWRlcigpLT5sb2FkKGRsLCB0aGlzLCBmYWxzZSk7CiAgICAgbV9sb2FkaW5nID0gdHJ1 ZTsKLSAgICBpZighY2hhcnNldC5pc0VtcHR5KCkpCisgICAgaWYgKCFjaGFyc2V0LmlzRW1wdHko KSkKIAltX2NvZGVjID0gUVRleHRDb2RlYzo6Y29kZWNGb3JOYW1lKGNoYXJzZXQubGF0aW4xKCkp OwotICAgIGVsc2UKKyAgICBpZiAoIW1fY29kZWMpCiAgICAgICAgIG1fY29kZWMgPSBRVGV4dENv ZGVjOjpjb2RlY0Zvck5hbWUoImlzbzg4NTktMSIpOwogfQogCkBAIC0yNDcsMTkgKzI0NywxOSBA QCB2b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OmVycm9yKCBpbnQgLyplCiAvLyAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIENhY2hlZFNjcmlwdDo6Q2FjaGVkU2NyaXB0KERv Y0xvYWRlciogZGwsIGNvbnN0IERPTVN0cmluZyAmdXJsLCBLSU86OkNhY2hlQ29udHJvbCBfY2Fj aGVQb2xpY3ksIHRpbWVfdCBfZXhwaXJlRGF0ZSwgY29uc3QgUVN0cmluZyYgY2hhcnNldCkKLSAg ICA6IENhY2hlZE9iamVjdCh1cmwsIFNjcmlwdCwgX2NhY2hlUG9saWN5LCBfZXhwaXJlRGF0ZSkK KyAgICA6IENhY2hlZE9iamVjdCh1cmwsIFNjcmlwdCwgX2NhY2hlUG9saWN5LCBfZXhwaXJlRGF0 ZSksIG1fY29kZWMoMCkKIHsKICAgICAvLyBJdCdzIGphdmFzY3JpcHQgd2Ugd2FudC4KICAgICAv LyBCdXQgc29tZSB3ZWJzaXRlcyB0aGluayB0aGVpciBzY3JpcHRzIGFyZSA8c29tZSB3cm9uZyBt aW1ldHlwZSBoZXJlPgogICAgIC8vIGFuZCByZWZ1c2UgdG8gc2VydmUgdGhlbSBpZiB3ZSBvbmx5 IGFjY2VwdCBhcHBsaWNhdGlvbi94LWphdmFzY3JpcHQuCi0gICAgc2V0QWNjZXB0KCBRU3RyaW5n Ojpmcm9tTGF0aW4xKCIqLyoiKSApOworICAgIHNldEFjY2VwdCgiKi8qIik7CiAgICAgbV9lcnJv ck9jY3VycmVkID0gZmFsc2U7CiAgICAgLy8gbG9hZCB0aGUgZmlsZQogICAgIENhY2hlOjpsb2Fk ZXIoKS0+bG9hZChkbCwgdGhpcywgZmFsc2UpOwogICAgIG1fbG9hZGluZyA9IHRydWU7Ci0gICAg aWYoIWNoYXJzZXQuaXNFbXB0eSgpKQorICAgIGlmICghY2hhcnNldC5pc0VtcHR5KCkpCiAgICAg ICAgIG1fY29kZWMgPSBRVGV4dENvZGVjOjpjb2RlY0Zvck5hbWUoY2hhcnNldC5sYXRpbjEoKSk7 Ci0gICAgZWxzZQorICAgIGlmICghbV9jb2RlYykKIAltX2NvZGVjID0gUVRleHRDb2RlYzo6Y29k ZWNGb3JOYW1lKCJpc284ODU5LTEiKTsKIH0KIApAQCAtNjI5LDcgKzYyOSw3IEBAIENhY2hlZFhT TFN0eWxlU2hlZXQ6OkNhY2hlZFhTTFN0eWxlU2hlZXQKIHsKICAgICAvLyBJdCdzIFhNTCB3ZSB3 YW50LgogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBhY2NlcHQgbW9yZSBnZW5lcmFsIHhtbCBm b3JtYXRzICovKit4bWwsIGltYWdlL3N2Zyt4bWwgZm9yIGV4YW1wbGUuCi0gICAgc2V0QWNjZXB0 KFFTdHJpbmc6OmZyb21MYXRpbjEoInRleHQveG1sLCBhcHBsaWNhdGlvbi94bWwsIGFwcGxpY2F0 aW9uL3hodG1sK3htbCwgdGV4dC94c2wsIGFwcGxpY2F0aW9uL3Jzcyt4bWwsIGFwcGxpY2F0aW9u L2F0b20reG1sIikpOworICAgIHNldEFjY2VwdCgidGV4dC94bWwsIGFwcGxpY2F0aW9uL3htbCwg YXBwbGljYXRpb24veGh0bWwreG1sLCB0ZXh0L3hzbCwgYXBwbGljYXRpb24vcnNzK3htbCwgYXBw bGljYXRpb24vYXRvbSt4bWwiKTsKICAgICAKICAgICAvLyBsb2FkIHRoZSBmaWxlCiAgICAgQ2Fj aGU6OmxvYWRlcigpLT5sb2FkKGRsLCB0aGlzLCBmYWxzZSk7CkBAIC02OTUsNyArNjk1LDcgQEAg Q2FjaGVkWEJMRG9jdW1lbnQ6OkNhY2hlZFhCTERvY3VtZW50KERvYwogOiBDYWNoZWRPYmplY3Qo dXJsLCBYQkwsIF9jYWNoZVBvbGljeSwgX2V4cGlyZURhdGUpLCBtX2RvY3VtZW50KDApCiB7CiAg ICAgLy8gSXQncyBYTUwgd2Ugd2FudC4KLSAgICBzZXRBY2NlcHQoIFFTdHJpbmc6OmZyb21MYXRp bjEoInRleHQveG1sLCBhcHBsaWNhdGlvbi94bWwsIGFwcGxpY2F0aW9uL3hodG1sK3htbCwgdGV4 dC94c2wsIGFwcGxpY2F0aW9uL3Jzcyt4bWwsIGFwcGxpY2F0aW9uL2F0b20reG1sIikgKTsKKyAg ICBzZXRBY2NlcHQoInRleHQveG1sLCBhcHBsaWNhdGlvbi94bWwsIGFwcGxpY2F0aW9uL3hodG1s K3htbCwgdGV4dC94c2wsIGFwcGxpY2F0aW9uL3Jzcyt4bWwsIGFwcGxpY2F0aW9uL2F0b20reG1s Iik7CiAgICAgCiAgICAgLy8gTG9hZCB0aGUgZmlsZQogICAgIENhY2hlOjpsb2FkZXIoKS0+bG9h ZChkbCwgdGhpcywgZmFsc2UpOwo=