45643 2010-09-13 02:10:09 -0700 [Qt] Don't add empty strings to list of supported image MIME types 2011-01-26 13:17:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned abarth ademar eric robert webkit.review.bot oldest_to_newest 278068 0 kling 2010-09-13 02:10:09 -0700 After <http://trac.webkit.org/changeset/67355> getMIMETypeForExtension() returns an empty string instead of "application/octet-stream" for unsupported extensions. We shouldn't add this to the list of supported types. We can also remove the logic in initializeSupportedImageMIMETypes() and initializeSupportedImageMIMETypesForEncoding() that cleans out "application/octet-stream" from the list of supported types. 278069 1 67380 kling 2010-09-13 02:11:50 -0700 Created attachment 67380 Proposed patch 278082 2 67380 kenneth 2010-09-13 02:34:16 -0700 Comment on attachment 67380 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=67380&action=prettypatch Any tests for this? 278094 3 67389 kling 2010-09-13 03:11:35 -0700 Created attachment 67389 Proposed patch v2 (r=kenneth) Don't know how to test this since I'd need to call WebCore internals. Added comment to ChangeLog about this fixing a crash in initializeMIMETypeRegistry(). 278096 4 67390 kling 2010-09-13 03:13:29 -0700 Created attachment 67390 Proposed patch v3 (r=kenneth) Oops, remove junk from patch. 278098 5 67390 kling 2010-09-13 03:15:42 -0700 Comment on attachment 67390 Proposed patch v3 (r=kenneth) Clearing flags on attachment: 67390 Committed r67375: <http://trac.webkit.org/changeset/67375> 278099 6 kling 2010-09-13 03:15:53 -0700 All reviewed patches have been landed. Closing bug. 278116 7 webkit.review.bot 2010-09-13 04:16:49 -0700 http://trac.webkit.org/changeset/67375 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/67376 http://trac.webkit.org/changeset/67375 340427 8 ademar 2011-01-26 13:17:02 -0800 Revision r67375 cherry-picked into qtwebkit-2.1.x with commit 495f6f1 <http://gitorious.org/webkit/qtwebkit/commit/495f6f1> 67380 2010-09-13 02:11:50 -0700 2010-09-13 03:11:35 -0700 Proposed patch bug-45643.diff text/plain 2567 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGJkMzIzZS4uOTRhMzA2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0xMyAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRG9uJ3QgYWRkIGVtcHR5IHN0cmluZ3MgdG8gbGlz dCBvZiBzdXBwb3J0ZWQgaW1hZ2UgTUlNRSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU2NDMKKworICAgICAgICBBZnRlciA8aHR0cDovL3Ry YWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNjczNTU+IGdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKCkK KyAgICAgICAgcmV0dXJucyBhbiBlbXB0eSBzdHJpbmcgaW5zdGVhZCBvZiAiYXBwbGljYXRpb24v b2N0ZXQtc3RyZWFtIiBmb3IgdW5zdXBwb3J0ZWQKKyAgICAgICAgZXh0ZW5zaW9ucy4gRG9uJ3Qg YWRkIHRoZXNlIHRvIHRoZSBsaXN0IG9mIHN1cHBvcnRlZCB0eXBlcywgYW5kIGNsZWFuIG91dAor ICAgICAgICB0aGUgbG9naWMgdGhhdCByZW1vdmVkICJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0i IGZyb20gc3VwcG9ydGVkIHR5cGVzLgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdp c3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1F VHlwZXMpOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5 cGVzRm9yRW5jb2RpbmcpOgorCiAyMDEwLTA5LTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9N SU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCA5ODQyZDhjLi4yMDAyMDE4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTEwMiwxMiArMTAyLDExIEBAIHN0YXRpYyB2b2lk IGluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcygpCiAgICAgICAgICAgICBjb250aW51 ZTsKICNlbmRpZgogICAgICAgICBTdHJpbmcgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5Ojpn ZXRNSU1FVHlwZUZvckV4dGVuc2lvbihmb3JtYXRzLmF0KGkpLmNvbnN0RGF0YSgpKTsKLSAgICAg ICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7Ci0gICAgICAgIHN1cHBv cnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7CisgICAgICAgIGlmICgh bWltZVR5cGUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBl cy0+YWRkKG1pbWVUeXBlKTsKKyAgICAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1F VHlwZXMtPmFkZChtaW1lVHlwZSk7CisgICAgICAgIH0KICAgICB9Ci0KLSAgICBzdXBwb3J0ZWRJ bWFnZU1JTUVUeXBlcy0+cmVtb3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKLSAgICBz dXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5yZW1vdmUoImFwcGxpY2F0aW9uL29jdGV0 LXN0cmVhbSIpOwogI2Vsc2UKICAgICAvLyBhc3N1bWUgdGhhdCBhbGwgaW1wbGVtZW50YXRpb25z IGF0IGxlYXN0IHN1cHBvcnQgdGhlIGZvbGxvd2luZyBzdGFuZGFyZAogICAgIC8vIGltYWdlIHR5 cGVzOgpAQCAtMTUyLDEwICsxNTEsOSBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU3VwcG9ydGVk SW1hZ2VNSU1FVHlwZXNGb3JFbmNvZGluZygpCiAgICAgUUxpc3Q8UUJ5dGVBcnJheT4gZm9ybWF0 cyA9IFFJbWFnZVdyaXRlcjo6c3VwcG9ydGVkSW1hZ2VGb3JtYXRzKCk7CiAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBmb3JtYXRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFN0cmluZyBtaW1lVHlw ZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGZvcm1hdHMuYXQo aSkuY29uc3REYXRhKCkpOwotICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29k aW5nLT5hZGQobWltZVR5cGUpOworICAgICAgICBpZiAoIW1pbWVUeXBlLmlzRW1wdHkoKSkKKyAg ICAgICAgICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZChtaW1lVHlw ZSk7CiAgICAgfQotCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JFbmNvZGluZy0+cmVt b3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKICNlbGlmIFBMQVRGT1JNKEdUSykKICAg ICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nLT5hZGQoImltYWdlL3BuZyIpOwog ICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZCgiaW1hZ2UvanBlZyIp Owo= 67389 2010-09-13 03:11:35 -0700 2010-09-13 03:13:29 -0700 Proposed patch v2 (r=kenneth) bug-45618-2.diff text/plain 5110 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGJkMzIzZS4uNjNmY2IzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0xMyAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5l dGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFtRdF0gRG9uJ3QgYWRkIGVtcHR5IHN0 cmluZ3MgdG8gbGlzdCBvZiBzdXBwb3J0ZWQgaW1hZ2UgTUlNRSB0eXBlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU2NDMKKworICAgICAgICBBZnRl ciA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNjczNTU+IGdldE1JTUVUeXBlRm9y RXh0ZW5zaW9uKCkKKyAgICAgICAgcmV0dXJucyBhbiBlbXB0eSBzdHJpbmcgaW5zdGVhZCBvZiAi YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIiBmb3IgdW5zdXBwb3J0ZWQKKyAgICAgICAgZXh0ZW5z aW9ucy4gRG9uJ3QgYWRkIHRoZXNlIHRvIHRoZSBsaXN0IG9mIHN1cHBvcnRlZCB0eXBlcywgYW5k IGNsZWFuIG91dAorICAgICAgICB0aGUgbG9naWMgdGhhdCByZW1vdmVkICJhcHBsaWNhdGlvbi9v Y3RldC1zdHJlYW0iIGZyb20gc3VwcG9ydGVkIHR5cGVzLgorCisgICAgICAgIEZpeGVzIGNyYXNo IGluIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCkgZHVlIHRvIGluc2VydGluZyBTdHJpbmco KSBpbnRvCisgICAgICAgIGEgSGFzaFNldDxTdHJpbmc+LgorCisgICAgICAgICogcGxhdGZvcm0v TUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9y dGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcpOgorCiAyMDEwLTA5LTEzICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUucHJvIGIvV2ViQ29yZS9XZWJDb3JlLnBybwppbmRl eCA2YzY3YmRlLi43Y2NhY2VlIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUucHJvCisrKyBi L1dlYkNvcmUvV2ViQ29yZS5wcm8KQEAgLTYsMTAgKzYsMTAgQEAgbWVlZ290b3VjaCB7CiAgICAg REVGSU5FUyArPSBXVEZfVVNFX01FRUdPVE9VQ0g9MQogfQogCi12ODpleGlzdHMoJCRbUVRfSU5T VEFMTF9QUkVGSVhdL3NyYy8zcmRwYXJ0eS92OC9pbmNsdWRlL3Y4LmgpIHsKK3Y4OmV4aXN0cygk JChRVFNSQ0RJUikvc3JjLzNyZHBhcnR5L3Y4L2luY2x1ZGUvdjguaCkgewogICAgIG1lc3NhZ2Uo VXNpbmcgVjggd2l0aCBRdFNjcmlwdCkKICAgICBRVCArPSBzY3JpcHQKLSAgICBJTkNMVURFUEFU SCArPSAkJFtRVF9JTlNUQUxMX1BSRUZJWF0vc3JjLzNyZHBhcnR5L3Y4L2luY2x1ZGUKKyAgICBJ TkNMVURFUEFUSCArPSAkJChRVFNSQ0RJUikvc3JjLzNyZHBhcnR5L3Y4L2luY2x1ZGUKIAogICAg IERFRklORVMgKj0gVjhfQklORElORz0xCiAgICAgREVGSU5FUyArPSBXVEZfQ0hBTkdFUz0xCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCA5ODQyZDhjLi4yMDAyMDE4IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTEwMiwxMiArMTAyLDExIEBA IHN0YXRpYyB2b2lkIGluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcygpCiAgICAgICAg ICAgICBjb250aW51ZTsKICNlbmRpZgogICAgICAgICBTdHJpbmcgbWltZVR5cGUgPSBNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihmb3JtYXRzLmF0KGkpLmNvbnN0RGF0 YSgpKTsKLSAgICAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7Ci0g ICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7Cisg ICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBzdXBwb3J0ZWRJ bWFnZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlKTsKKyAgICAgICAgICAgIHN1cHBvcnRlZEltYWdl UmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7CisgICAgICAgIH0KICAgICB9Ci0KLSAg ICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcy0+cmVtb3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJl YW0iKTsKLSAgICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5yZW1vdmUoImFwcGxp Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwogI2Vsc2UKICAgICAvLyBhc3N1bWUgdGhhdCBhbGwgaW1w bGVtZW50YXRpb25zIGF0IGxlYXN0IHN1cHBvcnQgdGhlIGZvbGxvd2luZyBzdGFuZGFyZAogICAg IC8vIGltYWdlIHR5cGVzOgpAQCAtMTUyLDEwICsxNTEsOSBAQCBzdGF0aWMgdm9pZCBpbml0aWFs aXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JFbmNvZGluZygpCiAgICAgUUxpc3Q8UUJ5dGVB cnJheT4gZm9ybWF0cyA9IFFJbWFnZVdyaXRlcjo6c3VwcG9ydGVkSW1hZ2VGb3JtYXRzKCk7CiAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBmb3JtYXRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFN0 cmluZyBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9u KGZvcm1hdHMuYXQoaSkuY29uc3REYXRhKCkpOwotICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVU eXBlc0ZvckVuY29kaW5nLT5hZGQobWltZVR5cGUpOworICAgICAgICBpZiAoIW1pbWVUeXBlLmlz RW1wdHkoKSkKKyAgICAgICAgICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmct PmFkZChtaW1lVHlwZSk7CiAgICAgfQotCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JF bmNvZGluZy0+cmVtb3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKICNlbGlmIFBMQVRG T1JNKEdUSykKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nLT5hZGQoImlt YWdlL3BuZyIpOwogICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZCgi aW1hZ2UvanBlZyIpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0LnByaSBiL1dlYktpdC5wcmkKaW5kZXgg NDI3MjVkMi4uMDk1MWM2NSAxMDA2NDQKLS0tIGEvV2ViS2l0LnByaQorKysgYi9XZWJLaXQucHJp CkBAIC02LDYgKzYsOCBAQAogQ09ORklHKFFURElSX2J1aWxkKTogQ09ORklHICs9IHN0YW5kYWxv bmVfcGFja2FnZQogZWxzZTpleGlzdHMoJCRQV0QvV2ViQ29yZS9nZW5lcmF0ZWQpOiBDT05GSUcg Kz0gc3RhbmRhbG9uZV9wYWNrYWdlCiAKK0NPTkZJRyArPSB2OAorCiBDT05GSUcgKz0gZGVwZW5k X2luY2x1ZGVwYXRoCiAKIERFRklORVMgKz0gQlVJTERJTkdfUVRfXz0xCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0CmluZGV4IDQyMzQ5MDUuLjE1MTQ2NjIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CkBAIC01MCw2ICs1MCw3IEBAIGNoZGlyV2ViS2l0KCk7CiBteSAkc2hvd0hlbHAgPSAwOwog bXkgJGNsZWFuID0gMDsKIG15ICRtaW5pbWFsID0gMDsKK215ICR2OCA9IDA7CiBteSAkaW5zdGFs bEhlYWRlcnM7CiBteSAkaW5zdGFsbExpYnM7CiBteSAkcHJlZml4UGF0aDsKQEAgLTIyNiw2ICsy MjcsMTMgQEAgZm9yZWFjaCAoQEFSR1YpIHsKICAgICB9CiB9CiAKK2ZvcmVhY2ggKEBBUkdWKSB7 CisgICAgaWYgKCRfIGVxICctLXY4JykgeworICAgICAgICAkdjggPSAxOworICAgICAgICBsYXN0 OworICAgIH0KK30KKwogIyBJbml0aWFsaXplIHZhbHVlcyBmcm9tIGRlZmF1bHRzCiBmb3JlYWNo IChAZmVhdHVyZXMpIHsKICAgICAkeyRfLT57dmFsdWV9fSA9ICgkXy0+e2RlZmF1bHR9ICYmICEk bWluaW1hbCkgfHwgMDsKQEAgLTI1MCw2ICsyNTgsNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtv cHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KIAogICAtLWluc3RhbGwt aGVhZGVycz08cGF0aD4gICAgICAgICAgU2V0IGluc3RhbGxhdGlvbiBwYXRoIGZvciB0aGUgaGVh ZGVycyAoUXQgb25seSkKICAgLS1pbnN0YWxsLWxpYnM9PHBhdGg+ICAgICAgICAgICAgIFNldCBp bnN0YWxsYXRpb24gcGF0aCBmb3IgdGhlIGxpYnJhcmllcyAoUXQgb25seSkKKyAgLS12OCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFVzZSBWOCBhcyBKYXZhU2NyaXB0IGVuZ2luZSAoUXQg b25seSkKIAogICAtLXByZWZpeD08cGF0aD4gICAgICAgICAgICAgICAgICAgU2V0IGluc3RhbGxh dGlvbiBwcmVmaXggdG8gdGhlIGdpdmVuIHBhdGggKEd0ayBvbmx5KQogICAtLW1ha2VhcmdzPTxh cmd1bWVudHM+ICAgICAgICAgICAgT3B0aW9uYWwgTWFrZWZpbGUgZmxhZ3MKQEAgLTI2Niw2ICsy NzUsNyBAQCBteSAlb3B0aW9ucyA9ICgKICAgICAncHJlZml4PXMnID0+IFwkcHJlZml4UGF0aCwK ICAgICAnbWFrZWFyZ3M9cycgPT4gXCRtYWtlQXJncywKICAgICAnbWluaW1hbCcgPT4gXCRtaW5p bWFsLAorICAgICd2OCcgPT4gXCR2OCwKICk7CiAKICMgQnVpbGQgdXNhZ2UgdGV4dCBhbmQgb3B0 aW9ucyBsaXN0IGZyb20gZmVhdHVyZXMKQEAgLTM5NSw2ICs0MDUsMTAgQEAgaWYgKGlzR3RrKCkp IHsKICAgICBpZiAoJG1pbmltYWwpIHsKICAgICAgICAgcHVzaCBAb3B0aW9ucywgIkNPTkZJRys9 bWluaW1hbCI7CiAgICAgfQorCisgICAgaWYgKCR2OCkgeworICAgICAgICBwdXNoIEBvcHRpb25z LCAiQ09ORklHKz12OCI7CisgICAgfQogfQogCiAjIEZvcmNlIHJlLWxpbmsgb2YgZXhpc3Rpbmcg bGlicmFyaWVzIGlmIGRpZmZlcmVudCB0aGFuIGV4cGVjdGVkCg== 67390 2010-09-13 03:13:29 -0700 2010-09-13 03:15:42 -0700 Proposed patch v3 (r=kenneth) bug-45643-v3.diff text/plain 2693 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGJkMzIzZS4uNjNmY2IzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0xMyAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5l dGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFtRdF0gRG9uJ3QgYWRkIGVtcHR5IHN0 cmluZ3MgdG8gbGlzdCBvZiBzdXBwb3J0ZWQgaW1hZ2UgTUlNRSB0eXBlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU2NDMKKworICAgICAgICBBZnRl ciA8aHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNjczNTU+IGdldE1JTUVUeXBlRm9y RXh0ZW5zaW9uKCkKKyAgICAgICAgcmV0dXJucyBhbiBlbXB0eSBzdHJpbmcgaW5zdGVhZCBvZiAi YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIiBmb3IgdW5zdXBwb3J0ZWQKKyAgICAgICAgZXh0ZW5z aW9ucy4gRG9uJ3QgYWRkIHRoZXNlIHRvIHRoZSBsaXN0IG9mIHN1cHBvcnRlZCB0eXBlcywgYW5k IGNsZWFuIG91dAorICAgICAgICB0aGUgbG9naWMgdGhhdCByZW1vdmVkICJhcHBsaWNhdGlvbi9v Y3RldC1zdHJlYW0iIGZyb20gc3VwcG9ydGVkIHR5cGVzLgorCisgICAgICAgIEZpeGVzIGNyYXNo IGluIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCkgZHVlIHRvIGluc2VydGluZyBTdHJpbmco KSBpbnRvCisgICAgICAgIGEgSGFzaFNldDxTdHJpbmc+LgorCisgICAgICAgICogcGxhdGZvcm0v TUlNRVR5cGVSZWdpc3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9y dGVkSW1hZ2VNSU1FVHlwZXMpOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcpOgorCiAyMDEwLTA5LTEzICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCA5ODQyZDhjLi4yMDAyMDE4IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTEwMiwxMiArMTAyLDExIEBA IHN0YXRpYyB2b2lkIGluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcygpCiAgICAgICAg ICAgICBjb250aW51ZTsKICNlbmRpZgogICAgICAgICBTdHJpbmcgbWltZVR5cGUgPSBNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihmb3JtYXRzLmF0KGkpLmNvbnN0RGF0 YSgpKTsKLSAgICAgICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7Ci0g ICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7Cisg ICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBzdXBwb3J0ZWRJ bWFnZU1JTUVUeXBlcy0+YWRkKG1pbWVUeXBlKTsKKyAgICAgICAgICAgIHN1cHBvcnRlZEltYWdl UmVzb3VyY2VNSU1FVHlwZXMtPmFkZChtaW1lVHlwZSk7CisgICAgICAgIH0KICAgICB9Ci0KLSAg ICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcy0+cmVtb3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJl YW0iKTsKLSAgICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5yZW1vdmUoImFwcGxp Y2F0aW9uL29jdGV0LXN0cmVhbSIpOwogI2Vsc2UKICAgICAvLyBhc3N1bWUgdGhhdCBhbGwgaW1w bGVtZW50YXRpb25zIGF0IGxlYXN0IHN1cHBvcnQgdGhlIGZvbGxvd2luZyBzdGFuZGFyZAogICAg IC8vIGltYWdlIHR5cGVzOgpAQCAtMTUyLDEwICsxNTEsOSBAQCBzdGF0aWMgdm9pZCBpbml0aWFs aXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JFbmNvZGluZygpCiAgICAgUUxpc3Q8UUJ5dGVB cnJheT4gZm9ybWF0cyA9IFFJbWFnZVdyaXRlcjo6c3VwcG9ydGVkSW1hZ2VGb3JtYXRzKCk7CiAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBmb3JtYXRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFN0 cmluZyBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9u KGZvcm1hdHMuYXQoaSkuY29uc3REYXRhKCkpOwotICAgICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVU eXBlc0ZvckVuY29kaW5nLT5hZGQobWltZVR5cGUpOworICAgICAgICBpZiAoIW1pbWVUeXBlLmlz RW1wdHkoKSkKKyAgICAgICAgICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2Rpbmct PmFkZChtaW1lVHlwZSk7CiAgICAgfQotCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXNGb3JF bmNvZGluZy0+cmVtb3ZlKCJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKICNlbGlmIFBMQVRG T1JNKEdUSykKICAgICBzdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nLT5hZGQoImlt YWdlL3BuZyIpOwogICAgIHN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmctPmFkZCgi aW1hZ2UvanBlZyIpOwo=