22488 2008-11-25 10:48:45 -0800 Make DRT smarter about charset encoding when post-processing webarchive content 2008-11-26 11:38:39 -0800 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer ap koivisto mrowe sam oldest_to_newest 100234 0 ddkilzer 2008-11-25 10:48:45 -0800 * SUMMARY When attempting to create a layout test for Bug 22466, I tried moving fast/encoding/preload-encoding.html to an http test. After setting the charset encoding for the "gb2312" files using a .htaccess file, I found that DRT would crash in convertWebResourceDataToString() because dataAsString was nil using the hard-coded UTF-8 encoding: NSString *dataAsString = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease]; [resource setObject:dataAsString forKey:@"WebResourceData"]; * THE FIX The better way to do this is to: 1. Attempt to convert the IANA charset into an NSStringEncoding value. 2. Check that dataAsString is non-nil before replacing it in the dictionary. Instead of crashing, the worst that will happen is that the string data won't be decoded in the webarchive test output. 100237 1 25488 ddkilzer 2008-11-25 10:57:47 -0800 Created attachment 25488 Patch v1 Suggested fix. No layout test since this is a DRT fix. 100423 2 ddkilzer 2008-11-26 11:38:39 -0800 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm Committed r38786 http://trac.webkit.org/changeset/38786 25488 2008-11-25 10:57:47 -0800 2008-11-26 11:15:14 -0800 Patch v1 bug-22488-v1.diff text/plain 3219 ddkilzer Y29tbWl0IDdjY2I4Zjk1Y2NmZjRmNWI4ZTFjMDBkNWM3NGI4N2U3MjEyMDNlZmIKQXV0aG9yOiBE YXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0ZTogICBNb24gTm92IDI0IDE0OjIx OjQzIDIwMDggLTA4MDAKCiAgICAgICAgICAgIEJ1ZyAyMjQ4ODogTWFrZSBEUlQgc21hcnRlciBh Ym91dCBjaGFyc2V0IGVuY29kaW5nIHdoZW4gcG9zdC1wcm9jZXNzaW5nIHdlYmFyY2hpdmUgY29u dGVudAogICAgCiAgICAgICAgICAgIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI0ODg+CiAgICAKICAgICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CiAgICAKICAgICAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06 CiAgICAgICAgICAgIChjb252ZXJ0V2ViUmVzb3VyY2VEYXRhVG9TdHJpbmcpOiBJZiBhbiBJQU5B IGNoYXJzZXQgZW5jb2Rpbmcgc3RyaW5nCiAgICAgICAgICAgIGlzIHByb3ZpZGVkLCBjb252ZXJ0 IGl0IHRvIGEgQ0ZTdHJpbmdFbmNvZGluZyB2YWx1ZSBhbmQgdGhlbiB0byBhbgogICAgICAgICAg ICBOU1N0cmluZ0VuY29kaW5nIHZhbHVlLCBlbHNlIGZhbGwgYmFjayB0byBOU1VURjhTdHJpbmdF bmNvZGluZy4gIFdlCiAgICAgICAgICAgIGFsc28gbmlsLWNoZWNrIGRhdGFBc1N0cmluZywgc28g dGhlIHdvcnN0LWNhc2Ugc2NlbmFyaW8gaXMgdGhhdCB0aGUKICAgICAgICAgICAgZGF0YSB3b24n dCBiZSBkZWNvZGVkIHRvIGEgc3RyaW5nICh2ZXJzdXMgY3Jhc2hpbmcgRHVtcFJlbmRlclRyZWUp LgoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5n ZUxvZwppbmRleCBkMWY5MGZiLi45YTM4ZGUwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDgt MTEtMjUgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcg MjI0ODg6IE1ha2UgRFJUIHNtYXJ0ZXIgYWJvdXQgY2hhcnNldCBlbmNvZGluZyB3aGVuIHBvc3Qt cHJvY2Vzc2luZyB3ZWJhcmNoaXZlIGNvbnRlbnQKKworICAgICAgICA8aHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDg4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJU cmVlLm1tOgorICAgICAgICAoY29udmVydFdlYlJlc291cmNlRGF0YVRvU3RyaW5nKTogSWYgYW4g SUFOQSBjaGFyc2V0IGVuY29kaW5nIHN0cmluZworICAgICAgICBpcyBwcm92aWRlZCwgY29udmVy dCBpdCB0byBhIENGU3RyaW5nRW5jb2RpbmcgdmFsdWUgYW5kIHRoZW4gdG8gYW4KKyAgICAgICAg TlNTdHJpbmdFbmNvZGluZyB2YWx1ZSwgZWxzZSBmYWxsIGJhY2sgdG8gTlNVVEY4U3RyaW5nRW5j b2RpbmcuICBXZQorICAgICAgICBhbHNvIG5pbC1jaGVjayBkYXRhQXNTdHJpbmcsIHNvIHRoZSB3 b3JzdC1jYXNlIHNjZW5hcmlvIGlzIHRoYXQgdGhlCisgICAgICAgIGRhdGEgd29uJ3QgYmUgZGVj b2RlZCB0byBhIHN0cmluZyAodmVyc3VzIGNyYXNoaW5nIER1bXBSZW5kZXJUcmVlKS4KKwogMjAw OC0xMS0xOSAgR3JlZyBCb2xzaW5nYSAgPGJvbHNpbmdhQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbSBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L21hYy9EdW1wUmVuZGVyVHJlZS5tbQppbmRleCAwYjdkNzk4Li5jMTcwMTA4IDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KKysrIGIv V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCkBAIC02NzEs MTEgKzY3MSwyMCBAQCBzdGF0aWMgdm9pZCBjb252ZXJ0V2ViUmVzb3VyY2VEYXRhVG9TdHJpbmco TlNNdXRhYmxlRGljdGlvbmFyeSAqcmVzb3VyY2UpCiB7CiAgICAgTlNNdXRhYmxlU3RyaW5nICpt aW1lVHlwZSA9IFtyZXNvdXJjZSBvYmplY3RGb3JLZXk6QCJXZWJSZXNvdXJjZU1JTUVUeXBlIl07 CiAgICAgY29udmVydE1JTUVUeXBlKG1pbWVUeXBlKTsKLSAgICAKKwogICAgIGlmIChbbWltZVR5 cGUgaGFzUHJlZml4OkAidGV4dC8iXSB8fCBbW1dlYkhUTUxSZXByZXNlbnRhdGlvbiBzdXBwb3J0 ZWROb25JbWFnZU1JTUVUeXBlc10gY29udGFpbnNPYmplY3Q6bWltZVR5cGVdKSB7CisgICAgICAg IE5TU3RyaW5nICp0ZXh0RW5jb2RpbmdOYW1lID0gW3Jlc291cmNlIG9iamVjdEZvcktleTpAIldl YlJlc291cmNlVGV4dEVuY29kaW5nTmFtZSJdOworICAgICAgICBOU1N0cmluZ0VuY29kaW5nIHN0 cmluZ0VuY29kaW5nOworICAgICAgICBpZiAoW3RleHRFbmNvZGluZ05hbWUgbGVuZ3RoXSA+IDAp CisgICAgICAgICAgICBzdHJpbmdFbmNvZGluZyA9IENGU3RyaW5nQ29udmVydEVuY29kaW5nVG9O U1N0cmluZ0VuY29kaW5nKENGU3RyaW5nQ29udmVydElBTkFDaGFyU2V0TmFtZVRvRW5jb2Rpbmco KENGU3RyaW5nUmVmKXRleHRFbmNvZGluZ05hbWUpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgc3RyaW5nRW5jb2RpbmcgPSBOU1VURjhTdHJpbmdFbmNvZGluZzsKKwogICAgICAgICBOU0Rh dGEgKmRhdGEgPSBbcmVzb3VyY2Ugb2JqZWN0Rm9yS2V5OkAiV2ViUmVzb3VyY2VEYXRhIl07Ci0g ICAgICAgIE5TU3RyaW5nICpkYXRhQXNTdHJpbmcgPSBbW1tOU1N0cmluZyBhbGxvY10gaW5pdFdp dGhEYXRhOmRhdGEgZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddIGF1dG9yZWxlYXNlXTsK LSAgICAgICAgW3Jlc291cmNlIHNldE9iamVjdDpkYXRhQXNTdHJpbmcgZm9yS2V5OkAiV2ViUmVz b3VyY2VEYXRhIl07CisgICAgICAgIE5TU3RyaW5nICpkYXRhQXNTdHJpbmcgPSBbW05TU3RyaW5n IGFsbG9jXSBpbml0V2l0aERhdGE6ZGF0YSBlbmNvZGluZzpzdHJpbmdFbmNvZGluZ107CisgICAg ICAgIGlmIChkYXRhQXNTdHJpbmcpCisgICAgICAgICAgICBbcmVzb3VyY2Ugc2V0T2JqZWN0OmRh dGFBc1N0cmluZyBmb3JLZXk6QCJXZWJSZXNvdXJjZURhdGEiXTsKKyAgICAgICAgW2RhdGFBc1N0 cmluZyByZWxlYXNlXTsKICAgICB9CiB9CiAK