103865 2012-12-03 00:46:20 -0800 [Qt] Don't rely on QMimeDatabase for essential MIME types 2012-12-05 04:38:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103747 1 pierre.rossi pierre.rossi allan.jensen hausmann webkit.review.bot oldest_to_newest 781198 0 pierre.rossi 2012-12-03 00:46:20 -0800 [Qt] Don't rely on QMimeDatabase for well-known extension to MIME type mapping. 781204 1 177202 pierre.rossi 2012-12-03 00:55:45 -0800 Created attachment 177202 Patch 781245 2 177202 allan.jensen 2012-12-03 02:14:55 -0800 Comment on attachment 177202 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177202&action=review > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:87 > String MIMETypeRegistry::getMIMETypeForPath(const String& path) > { > + size_t pos = path.reverseFind('.'); > + if (pos != notFound) { > + String extension = path.substring(pos + 1); > + String result = getWellKnownMIMETypeForExtension(extension); > + if (result.length()) > + return result; > + } > + Why is the change in getMIMETypeForPath? it is getMIMETypeForExtension that is used to determine if we should/can load content. 781252 3 allan.jensen 2012-12-03 02:18:13 -0800 Btw, I think we should add all the aliases of the supported mime-types so that we don't end up in that situation. 781336 4 pierre.rossi 2012-12-03 04:39:29 -0800 (In reply to comment #2) > (From update of attachment 177202 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177202&action=review > > > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:87 > > String MIMETypeRegistry::getMIMETypeForPath(const String& path) > > { > > + size_t pos = path.reverseFind('.'); > > + if (pos != notFound) { > > + String extension = path.substring(pos + 1); > > + String result = getWellKnownMIMETypeForExtension(extension); > > + if (result.length()) > > + return result; > > + } > > + > > Why is the change in getMIMETypeForPath? it is getMIMETypeForExtension that is used to determine if we should/can load content. It's used in QNetworkReplyHandler::sendResponseIfNeeded when loading local files. 782343 5 allan.jensen 2012-12-04 01:01:04 -0800 It seems some tools used for creating associating mimetypes to application will dynamical invent new mimetypes such as application/x-extension-html, which can confuse the mimedatabase because we only rely on the first match. We need to ensure users can not shoot themselves this hard with the basic mimetypes. For images and other types it can be potentially useful, but for html and other essential types it can only break stuff. 782354 6 177443 allan.jensen 2012-12-04 01:16:56 -0800 Created attachment 177443 Patch A condensed version of Pierre's patch only detecting the essential mimetypes and doing it for both getMimetype functions 783549 7 177443 jturcotte 2012-12-05 02:06:55 -0800 Comment on attachment 177443 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177443&action=review > Source/WebCore/ChangeLog:9 > + Extend the short static list to also include MIME types essential WebKit, to WebKit > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:59 > + { "xls", ".xls", "text/xsl" }, I didn't know we supported Excel sheets with WebKit :P > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:76 > + // FIXME: We should get all the matched mimetypes with mimeTypesForFileName, and prefer one we support. mimeTypesForFileName -> mimeTypesForFile? > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:77 > + // But initializeSupportedImageMIMETypes will first have to stop using getMIMETypeForExtension. Could you write why? I don't have enough context to understand this part. 783564 8 allan.jensen 2012-12-05 02:28:37 -0800 (In reply to comment #7) > (From update of attachment 177443 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177443&action=review > > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:76 > > + // FIXME: We should get all the matched mimetypes with mimeTypesForFileName, and prefer one we support. > > mimeTypesForFileName -> mimeTypesForFile? > Well, that is actually the name of this particular method in QMimeDatabase ;) > > Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp:77 > > + // But initializeSupportedImageMIMETypes will first have to stop using getMIMETypeForExtension. > > Could you write why? I don't have enough context to understand this part. Because to tell if a mime-type is supported we have to check against the supported mime-types, but we can not do that while we are still in the process of initializing the supported mime-types. 783570 9 177707 allan.jensen 2012-12-05 02:36:14 -0800 Created attachment 177707 Patch 783607 10 177707 jturcotte 2012-12-05 03:40:10 -0800 Comment on attachment 177707 Patch (In reply to comment #8) > Well, that is actually the name of this particular method in QMimeDatabase ;) Ah! I see what you mean, sorry about that. 783651 11 177707 webkit.review.bot 2012-12-05 04:38:22 -0800 Comment on attachment 177707 Patch Clearing flags on attachment: 177707 Committed r136669: <http://trac.webkit.org/changeset/136669> 783652 12 webkit.review.bot 2012-12-05 04:38:25 -0800 All reviewed patches have been landed. Closing bug. 177202 2012-12-03 00:55:45 -0800 2012-12-04 01:16:52 -0800 Patch bug-103865-20121203095312.patch text/plain 2165 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ3MTllM2UyYTdmMjNk MjQwZjk5ODkwYTMzM2M2ZWFiY2EyZmI0NS4uNTlmYmU4ZmQ2ZjlmN2Q5OTM5OGM2MDBhNGMzNWJk MzM0OTUzNzg1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTAzICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gRG9uJ3Qg cmVseSBvbiBRTWltZURhdGFiYXNlIGZvciB3ZWxsLWtub3duIGV4dGVuc2lvbiB0byBNSU1FIHR5 cGUgbWFwcGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMzg2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIERlcGVuZGluZyBvbiB0aGUgc3lzdGVtIGNvbmZpZ3VyYXRpb24sIFFNaW1lRGF0YWJhc2Ug Y2FuIGVuZCB1cCByZXR1cm5pbmcgYSBNSU1FIHR5cGUKKyAgICAgICAgb2YgImFwcGxpY2F0aW9u L3gtZXh0ZW5zaW9uLWh0bWwiIHdoZW4gbWF0Y2hpbmcgYSBsb2NhbCBwYXRoIGJ5IGV4dGVuc2lv bi4KKyAgICAgICAgVGhpcyB3b3VsZCBtYWtlIFFUZXN0QnJvd3NlciBvciBNaW5pQnJvd3NlciB1 bmFibGUgdG8gbG9hZCBsb2NhbCBodG1sIGZpbGVzCisgICAgICAgIGFzIHRoZXkgd291bGQgYmUg Y29uc2lkZXJlZCB1bnN1cHBvcnRlZCBjb250ZW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg aW4gdGhlIHNpdHVhdGlvbiBkZXNjcmliZWQsIG5vIGxheW91dCB0ZXN0IHdvdWxkIGxvYWQgYW55 d2F5LgorCisgICAgICAgICogcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yUGF0aCk6IExv b2t1cCB0aGUgd2VsbCBrbm93biBNSU1FIHR5cGVzIGZpcnN0CisgICAgICAgIGFuZCB1c2UgUU1p bWVEYXRhYmFzZSBhcyBhIGZhbGxiYWNrLgorCiAyMDEyLTEyLTAxICBYaWFvYm8gV2FuZyAgPHhp YW9iby53YW5nQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBEUlQgLSBjcmFzaGVkIGlu IFdlYkNvcmU6OlNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFu ZGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdp c3RyeVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L01JTUVUeXBlUmVnaXN0cnlR dC5jcHAKaW5kZXggZTQ1Mjc1ZTA5ZGUyMmVlYzA0N2EwNjQ4MmVhM2E1ZTIxYmU3ODc3Mi4uZTQ2 YmUxZGQxZGE0ZWU3NWFmZTFhMzQ3ZjIyNzNiNGIyNWFlNTJlYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9xdC9NSU1FVHlwZVJlZ2lzdHJ5UXQuY3BwCkBAIC03Nyw2ICs3Nywx NCBAQCBTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oY29u c3QgU3RyaW5nICZleHQpCiAKIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZv clBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogeworICAgIHNpemVfdCBwb3MgPSBwYXRoLnJldmVy c2VGaW5kKCcuJyk7CisgICAgaWYgKHBvcyAhPSBub3RGb3VuZCkgeworICAgICAgICBTdHJpbmcg ZXh0ZW5zaW9uID0gcGF0aC5zdWJzdHJpbmcocG9zICsgMSk7CisgICAgICAgIFN0cmluZyByZXN1 bHQgPSBnZXRXZWxsS25vd25NSU1FVHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOworICAgICAg ICBpZiAocmVzdWx0Lmxlbmd0aCgpKQorICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9 CisKICAgICBRTWltZVR5cGUgdHlwZSA9IFFNaW1lRGF0YWJhc2UoKS5taW1lVHlwZUZvckZpbGUo cGF0aCwgUU1pbWVEYXRhYmFzZTo6TWF0Y2hFeHRlbnNpb24pOwogICAgIGlmICh0eXBlLmlzVmFs aWQoKSAmJiAhdHlwZS5pc0RlZmF1bHQoKSkKICAgICAgICAgcmV0dXJuIHR5cGUubmFtZSgpOwo= 177443 2012-12-04 01:16:56 -0800 2012-12-05 02:36:11 -0800 Patch bug-103865-20121204101353.patch text/plain 4900 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRjYjc1NTQxYzlhYjU4 NTA0NWM5N2I5Mzc5YjExMTQ0ZDJmZGFjMS4uOTllZjIzZTY0YTM1Y2YzMzQ4NDg1ZDI0ZjU4ODU4 YmYxMDJjOGY2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gRG9uJ3QgcmVseSBvbiBRTWltZURhdGFiYXNlIGZvciBlc3NlbnRpYWwgTUlNRSB0eXBlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzODY1CisK KyAgICAgICAgQmFzZWQgb24gcGF0Y2ggYnkgUGllcnJlIFJvc3NpLgorICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRlbmQgdGhlIHNob3J0IHN0YXRpYyBs aXN0IHRvIGFsc28gaW5jbHVkZSBNSU1FIHR5cGVzIGVzc2VudGlhbCBXZWJLaXQsCisgICAgICAg IGFuZCBkZXRlY3QgdGhlc2UgZmlyc3QgYmVmb3JlIGNoZWNraW5nIHRoZSBzeXN0ZW0gbWltZWRh dGFiYXNlLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5z aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9y UGF0aCk6CisKIDIwMTItMTItMDQgIE1pY2hhZWwgUHJ1ZXR0ICA8bWljaGFlbEA2OGsub3JnPgog CiAgICAgICAgIFtKU0NdIEdlbmVyYXRlIHZpc2l0Q2hpbGRyZW4oKSBmb3IgdW5jdXN0b21pemVk IEV2ZW50VGFyZ2V0IGludGVyZmFjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3F0L01JTUVUeXBlUmVnaXN0cnlRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9x dC9NSU1FVHlwZVJlZ2lzdHJ5UXQuY3BwCmluZGV4IGU0NTI3NWUwOWRlMjJlZWMwNDdhMDY0ODJl YTNhNWUyMWJlNzg3NzIuLjg1MjdhMjM2MmM0MzlhNDE5NmUyY2ZmOTYxZmI5ZTY3ODI3MjY0OWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L01JTUVUeXBlUmVnaXN0cnlR dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0 LmNwcApAQCAtNDEsMjEgKzQxLDQwIEBAIHN0cnVjdCBFeHRlbnNpb25NYXAgewogICAgIGNvbnN0 IGNoYXIqIG1pbWVUeXBlOwogfTsKIAotLy8gVGhpcyBpcyBhIHNob3J0IGxpc3Qgb2YgZXh0ZW5z aW9ucyBub3QgcmVjb2duaXplZCBieSB0aGUgZnJlZWRlc2t0b3Agc2hhcmVkIG1pbWV0eXBlIGRh dGFiYXNlIDEuMC4KKy8vIFRoaXMgaXMgYSBzaG9ydCBsaXN0IG9mIGV4dGVuc2lvbnMgdGhhdCBp cyBlaXRoZXIgbm90IHJlY29nbml6ZWQgYnkgdGhlIGZyZWVkZXNrdG9wIHNoYXJlZCBtaW1ldHlw ZSBkYXRhYmFzZSAxLjAsCisvLyBvciB0b28gZXNzZW50aWFsIGZvciBRdFdlYktpdCB0aGF0IHdl IGNhbiBub3QgYWxsb3cgYSB1c2VyIGNvbmZpZ3VyYXRpb24gdG8gcG90ZW50aWFsbHkgb3ZlcnJp ZGUgaXQuCisvLyBBbnkgZXh0ZW5zaW9uIHRoYXQgaGFzIHRvIGJlIHJlY29nbml6ZWQgZm9yIHRo ZSBsYXlvdXQtdGVzdHMgdG8gcnVuIHNob3VsZCBiZSBhZGRlZCBoZXJlLgogc3RhdGljIGNvbnN0 IEV4dGVuc2lvbk1hcCBleHRlbnNpb25NYXBbXSA9IHsKLSAgICB7ICJtaHQiLCAiLm1odCIsICJh cHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LAotICAgIHsgIm1odG1sIiwgIi5taHRtbCIsICJh cHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LAotICAgIHsgInRleHQiLCAiLnRleHQiLCAidGV4 dC9wbGFpbiIgfSwKLSAgICB7ICJ3bWxjIiwgIi53bWxjIiwgImFwcGxpY2F0aW9uL3ZuZC53YXAu d21sYyIgfSwKKyAgICB7ICJodG0iLCAiLmh0bSIsICJ0ZXh0L2h0bWwiIH0sCisgICAgeyAiaHRt bCIsICIuaHRtbCIsICJ0ZXh0L2h0bWwiIH0sCisgICAgeyAianMiLCAiLmpzIiwgImFwcGxpY2F0 aW9uL2phdmFzY3JpcHQiIH0sCisgICAgeyAibWh0IiwgIi5taHQiLCAiYXBwbGljYXRpb24veC1t aW1lYXJjaGl2ZSIgfSwgLy8gTm90IGluIHNoYXJlZCBtaW1ldHlwZSBkYXRhYmFzZQorICAgIHsg Im1odG1sIiwgIi5taHRtbCIsICJhcHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LCAvLyBOb3Qg aW4gc2hhcmVkIG1pbWV0eXBlIGRhdGFiYXNlCisgICAgeyAic3ZnIiwgIi5zdmciLCAiaW1hZ2Uv c3ZnK3htbCIgfSwKKyAgICB7ICJ0ZXh0IiwgIi50ZXh0IiwgInRleHQvcGxhaW4iIH0sIC8vIE5v dCBpbiBzaGFyZWQgbWltZXR5cGUgZGF0YWJhc2UKKyAgICB7ICJ0eHQiLCAiLnR4dCIsICJ0ZXh0 L3BsYWluIn0sCisgICAgeyAid21sYyIsICIud21sYyIsICJhcHBsaWNhdGlvbi92bmQud2FwLndt bGMiIH0sIC8vIE5vdCBpbiBzaGFyZWQgbWltZXR5cGUgZGF0YWJhc2UKKyAgICB7ICJ4aHQiLCAi LnhodCIsICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiIH0sCisgICAgeyAieGh0bWwiLCAiLnhodG1s IiwgImFwcGxpY2F0aW9uL3hodG1sK3htbCIgfSwKKyAgICB7ICJ4bHMiLCAiLnhscyIsICJ0ZXh0 L3hzbCIgfSwKICAgICB7IDAsIDAsIDAgfQogfTsKIAogU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6 OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyAmZXh0KQogewotICAgIC8vIFFN aW1lRGF0YWJhc2UgbGFja3MgdGhlIGFiaWxpdHkgdG8gcXVlcnkgYnkgZXh0ZW5zaW9uIGFsb25l LCBzbyB3ZSBjcmVhdGUgYSBmYWtlIGZpbGVuYW1lIHRvIGxvb2t1cC4KICAgICBTdHJpbmcgc3Vm Zml4ID0gZXh0Lmxvd2VyKCk7CisgICAgY29uc3QgRXh0ZW5zaW9uTWFwICplID0gZXh0ZW5zaW9u TWFwOworICAgIHdoaWxlIChlLT5leHRlbnNpb24pIHsKKyAgICAgICAgaWYgKHN1ZmZpeCA9PSBl LT5leHRlbnNpb24pCisgICAgICAgICAgICByZXR1cm4gZS0+bWltZVR5cGU7CisgICAgICAgICsr ZTsKKyAgICB9CisKKyAgICAvLyBRTWltZURhdGFiYXNlIGxhY2tzIHRoZSBhYmlsaXR5IHRvIHF1 ZXJ5IGJ5IGV4dGVuc2lvbiBhbG9uZSwgc28gd2UgY3JlYXRlIGEgZmFrZSBmaWxlbmFtZSB0byBs b29rdXAuCiAgICAgY29uc3QgUVN0cmluZyBmaWxlbmFtZSA9IFFTdHJpbmdMaXRlcmFsKCJmaWxl bmFtZS4iKSArIFFTdHJpbmcoc3VmZml4KTsKIAorICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgZ2V0 IGFsbCB0aGUgbWF0Y2hlZCBtaW1ldHlwZXMgd2l0aCBtaW1lVHlwZXNGb3JGaWxlTmFtZSwgYW5k IHByZWZlciBvbmUgd2Ugc3VwcG9ydC4KKyAgICAvLyBCdXQgaW5pdGlhbGl6ZVN1cHBvcnRlZElt YWdlTUlNRVR5cGVzIHdpbGwgZmlyc3QgaGF2ZSB0byBzdG9wIHVzaW5nIGdldE1JTUVUeXBlRm9y RXh0ZW5zaW9uLgogICAgIFFNaW1lVHlwZSBtaW1lVHlwZSA9IFFNaW1lRGF0YWJhc2UoKS5taW1l VHlwZUZvckZpbGUoZmlsZW5hbWUsIFFNaW1lRGF0YWJhc2U6Ok1hdGNoRXh0ZW5zaW9uKTsKICAg ICBpZiAobWltZVR5cGUuaXNWYWxpZCgpICYmICFtaW1lVHlwZS5pc0RlZmF1bHQoKSkgewogICAg ICAgICAvLyBnZXRNSU1FVHlwZUZvckV4dGVuc2lvbiBpcyB1c2VkIGZvciBwcmVsb2FkIG1pbWV0 eXBlIGNoZWNrLCBzbyBpbWFnZSBsb29raW5nIGZpbGVzIGNhbiBub3QgYmUgbG9hZGVkIGFzIGFu eXRoaW5nIGJ1dCBpbWFnZXMuCkBAIC02NSwyOSArODQsMjMgQEAgU3RyaW5nIE1JTUVUeXBlUmVn aXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyAmZXh0KQogICAgICAg ICByZXR1cm4gbWltZVR5cGUubmFtZSgpOwogICAgIH0KIAotICAgIGNvbnN0IEV4dGVuc2lvbk1h cCAqZSA9IGV4dGVuc2lvbk1hcDsKLSAgICB3aGlsZSAoZS0+ZXh0ZW5zaW9uKSB7Ci0gICAgICAg IGlmIChzdWZmaXggPT0gZS0+ZXh0ZW5zaW9uKQotICAgICAgICAgICAgcmV0dXJuIGUtPm1pbWVU eXBlOwotICAgICAgICArK2U7Ci0gICAgfQotCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCiBT dHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JQYXRoKGNvbnN0IFN0cmluZyYg cGF0aCkKIHsKLSAgICBRTWltZVR5cGUgdHlwZSA9IFFNaW1lRGF0YWJhc2UoKS5taW1lVHlwZUZv ckZpbGUocGF0aCwgUU1pbWVEYXRhYmFzZTo6TWF0Y2hFeHRlbnNpb24pOwotICAgIGlmICh0eXBl LmlzVmFsaWQoKSAmJiAhdHlwZS5pc0RlZmF1bHQoKSkKLSAgICAgICAgcmV0dXJuIHR5cGUubmFt ZSgpOwotCiAgICAgY29uc3QgRXh0ZW5zaW9uTWFwICplID0gZXh0ZW5zaW9uTWFwOwogICAgIHdo aWxlIChlLT5leHRlbnNpb24pIHsKLSAgICAgICAgaWYgKHBhdGguZW5kc1dpdGgoZS0+ZG90RXh0 ZW5zaW9uKSkKKyAgICAgICAgaWYgKHBhdGguZW5kc1dpdGgoZS0+ZG90RXh0ZW5zaW9uLCAvKiBj YXNlU2Vuc2l0aXZlICovIGZhbHNlKSkKICAgICAgICAgICAgIHJldHVybiBlLT5taW1lVHlwZTsK ICAgICAgICAgKytlOwogICAgIH0KIAorICAgIC8vIEZJWE1FOiBTZWUgY29tbWVudCBpbiBnZXRN SU1FVHlwZUZvckV4dGVuc2lvbi4KKyAgICBRTWltZVR5cGUgdHlwZSA9IFFNaW1lRGF0YWJhc2Uo KS5taW1lVHlwZUZvckZpbGUocGF0aCwgUU1pbWVEYXRhYmFzZTo6TWF0Y2hFeHRlbnNpb24pOwor ICAgIGlmICh0eXBlLmlzVmFsaWQoKSAmJiAhdHlwZS5pc0RlZmF1bHQoKSkKKyAgICAgICAgcmV0 dXJuIHR5cGUubmFtZSgpOworCiAgICAgcmV0dXJuIGRlZmF1bHRNSU1FVHlwZSgpOwogfQogCg== 177707 2012-12-05 02:36:14 -0800 2012-12-05 04:38:22 -0800 Patch bug-103865-20121205113311.patch text/plain 4988 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU0OTcxMzFmYWZkZGY0 Mzc5N2Q3OGNiMzEyZDcyNjQ3NjAyNzZiNi4uMzU5ZDcwNmIwMzk0ODExOTg4ZjNlMTRiM2ExZDgz NGMwM2I5MjFkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gRG9uJ3QgcmVseSBvbiBRTWltZURhdGFiYXNlIGZvciBlc3NlbnRpYWwgTUlNRSB0eXBlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzODY1CisK KyAgICAgICAgQmFzZWQgb24gcGF0Y2ggYnkgUGllcnJlIFJvc3NpLgorICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRlbmQgdGhlIHNob3J0IHN0YXRpYyBs aXN0IHRvIGFsc28gaW5jbHVkZSBNSU1FIHR5cGVzIGVzc2VudGlhbCB0byBXZWJLaXQsCisgICAg ICAgIGFuZCBkZXRlY3QgdGhlc2UgZmlyc3QgYmVmb3JlIGNoZWNraW5nIHRoZSBzeXN0ZW0gbWlt ZWRhdGFiYXNlLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0 ZW5zaW9uKToKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBl Rm9yUGF0aCk6CisKIDIwMTItMTItMDUgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0NhbnZhc10gbml0OiBhZGQgbW9yZSB0 eXBpemF0aW9uIGZvciBqcyBjb21waWxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vcXQvTUlNRVR5cGVSZWdpc3RyeVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3F0L01JTUVUeXBlUmVnaXN0cnlRdC5jcHAKaW5kZXggZTQ1Mjc1ZTA5ZGUyMmVlYzA0N2EwNjQ4 MmVhM2E1ZTIxYmU3ODc3Mi4uOGQxNjdjN2I1ZjYwNWY1ZmJiZGFiZGQ3NTkyODhjNTc2ZTMyYTcz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTUlNRVR5cGVSZWdpc3Ry eVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9NSU1FVHlwZVJlZ2lzdHJ5 UXQuY3BwCkBAIC00MSwyMSArNDEsNDEgQEAgc3RydWN0IEV4dGVuc2lvbk1hcCB7CiAgICAgY29u c3QgY2hhciogbWltZVR5cGU7CiB9OwogCi0vLyBUaGlzIGlzIGEgc2hvcnQgbGlzdCBvZiBleHRl bnNpb25zIG5vdCByZWNvZ25pemVkIGJ5IHRoZSBmcmVlZGVza3RvcCBzaGFyZWQgbWltZXR5cGUg ZGF0YWJhc2UgMS4wLgorLy8gVGhpcyBpcyBhIHNob3J0IGxpc3Qgb2YgZXh0ZW5zaW9ucyB0aGF0 IGFyZSBlaXRoZXIgbm90IHJlY29nbml6ZWQgYnkgdGhlIGZyZWVkZXNrdG9wIHNoYXJlZCBtaW1l dHlwZSBkYXRhYmFzZSAxLjAsCisvLyBvciB0b28gZXNzZW50aWFsIGZvciBRdFdlYktpdCB0aGF0 IHdlIGNhbiBub3QgYWxsb3cgYSB1c2VyIGNvbmZpZ3VyYXRpb24gdG8gcG90ZW50aWFsbHkgb3Zl cnJpZGUgaXQuCisvLyBBbnkgZXh0ZW5zaW9uIHRoYXQgaGFzIHRvIGJlIHJlY29nbml6ZWQgZm9y IHRoZSBsYXlvdXQtdGVzdHMgdG8gcnVuIHNob3VsZCBiZSBhZGRlZCBoZXJlLgogc3RhdGljIGNv bnN0IEV4dGVuc2lvbk1hcCBleHRlbnNpb25NYXBbXSA9IHsKLSAgICB7ICJtaHQiLCAiLm1odCIs ICJhcHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LAotICAgIHsgIm1odG1sIiwgIi5taHRtbCIs ICJhcHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LAotICAgIHsgInRleHQiLCAiLnRleHQiLCAi dGV4dC9wbGFpbiIgfSwKLSAgICB7ICJ3bWxjIiwgIi53bWxjIiwgImFwcGxpY2F0aW9uL3ZuZC53 YXAud21sYyIgfSwKKyAgICB7ICJodG0iLCAiLmh0bSIsICJ0ZXh0L2h0bWwiIH0sCisgICAgeyAi aHRtbCIsICIuaHRtbCIsICJ0ZXh0L2h0bWwiIH0sCisgICAgeyAianMiLCAiLmpzIiwgImFwcGxp Y2F0aW9uL2phdmFzY3JpcHQiIH0sCisgICAgeyAibWh0IiwgIi5taHQiLCAiYXBwbGljYXRpb24v eC1taW1lYXJjaGl2ZSIgfSwgLy8gTm90IGluIHNoYXJlZCBtaW1ldHlwZSBkYXRhYmFzZQorICAg IHsgIm1odG1sIiwgIi5taHRtbCIsICJhcHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIiB9LCAvLyBO b3QgaW4gc2hhcmVkIG1pbWV0eXBlIGRhdGFiYXNlCisgICAgeyAic3ZnIiwgIi5zdmciLCAiaW1h Z2Uvc3ZnK3htbCIgfSwKKyAgICB7ICJ0ZXh0IiwgIi50ZXh0IiwgInRleHQvcGxhaW4iIH0sIC8v IE5vdCBpbiBzaGFyZWQgbWltZXR5cGUgZGF0YWJhc2UKKyAgICB7ICJ0eHQiLCAiLnR4dCIsICJ0 ZXh0L3BsYWluIn0sCisgICAgeyAid21sYyIsICIud21sYyIsICJhcHBsaWNhdGlvbi92bmQud2Fw LndtbGMiIH0sIC8vIE5vdCBpbiBzaGFyZWQgbWltZXR5cGUgZGF0YWJhc2UKKyAgICB7ICJ4aHQi LCAiLnhodCIsICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiIH0sCisgICAgeyAieGh0bWwiLCAiLnho dG1sIiwgImFwcGxpY2F0aW9uL3hodG1sK3htbCIgfSwKKyAgICB7ICJ4c2wiLCAiLnhzbCIsICJ0 ZXh0L3hzbCIgfSwKICAgICB7IDAsIDAsIDAgfQogfTsKIAogU3RyaW5nIE1JTUVUeXBlUmVnaXN0 cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyAmZXh0KQogewotICAgIC8v IFFNaW1lRGF0YWJhc2UgbGFja3MgdGhlIGFiaWxpdHkgdG8gcXVlcnkgYnkgZXh0ZW5zaW9uIGFs b25lLCBzbyB3ZSBjcmVhdGUgYSBmYWtlIGZpbGVuYW1lIHRvIGxvb2t1cC4KICAgICBTdHJpbmcg c3VmZml4ID0gZXh0Lmxvd2VyKCk7CisgICAgY29uc3QgRXh0ZW5zaW9uTWFwICplID0gZXh0ZW5z aW9uTWFwOworICAgIHdoaWxlIChlLT5leHRlbnNpb24pIHsKKyAgICAgICAgaWYgKHN1ZmZpeCA9 PSBlLT5leHRlbnNpb24pCisgICAgICAgICAgICByZXR1cm4gZS0+bWltZVR5cGU7CisgICAgICAg ICsrZTsKKyAgICB9CisKKyAgICAvLyBRTWltZURhdGFiYXNlIGxhY2tzIHRoZSBhYmlsaXR5IHRv IHF1ZXJ5IGJ5IGV4dGVuc2lvbiBhbG9uZSwgc28gd2UgY3JlYXRlIGEgZmFrZSBmaWxlbmFtZSB0 byBsb29rdXAuCiAgICAgY29uc3QgUVN0cmluZyBmaWxlbmFtZSA9IFFTdHJpbmdMaXRlcmFsKCJm aWxlbmFtZS4iKSArIFFTdHJpbmcoc3VmZml4KTsKIAorICAgIC8vIEZJWE1FOiBXZSBzaG91bGQg Z2V0IGFsbCB0aGUgbWF0Y2hlZCBtaW1ldHlwZXMgd2l0aCBtaW1lVHlwZXNGb3JGaWxlTmFtZSwg YW5kIHByZWZlciBvbmUgd2Ugc3VwcG9ydC4KKyAgICAvLyBCdXQgaW5pdGlhbGl6ZVN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzIHdpbGwgZmlyc3QgaGF2ZSB0byBzdG9wIHVzaW5nIGdldE1JTUVUeXBl Rm9yRXh0ZW5zaW9uLCBvciB3ZQorICAgIC8vIHdvdWxkIGJlIGNoZWNraW5nIGFnYWluc3QgYW4g dW5pbml0aWFsaXplZCBzZXQgb2Ygc3VwcG9ydGVkIG1pbWV0eXBlcy4KICAgICBRTWltZVR5cGUg bWltZVR5cGUgPSBRTWltZURhdGFiYXNlKCkubWltZVR5cGVGb3JGaWxlKGZpbGVuYW1lLCBRTWlt ZURhdGFiYXNlOjpNYXRjaEV4dGVuc2lvbik7CiAgICAgaWYgKG1pbWVUeXBlLmlzVmFsaWQoKSAm JiAhbWltZVR5cGUuaXNEZWZhdWx0KCkpIHsKICAgICAgICAgLy8gZ2V0TUlNRVR5cGVGb3JFeHRl bnNpb24gaXMgdXNlZCBmb3IgcHJlbG9hZCBtaW1ldHlwZSBjaGVjaywgc28gaW1hZ2UgbG9va2lu ZyBmaWxlcyBjYW4gbm90IGJlIGxvYWRlZCBhcyBhbnl0aGluZyBidXQgaW1hZ2VzLgpAQCAtNjUs MjkgKzg1LDIzIEBAIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVu c2lvbihjb25zdCBTdHJpbmcgJmV4dCkKICAgICAgICAgcmV0dXJuIG1pbWVUeXBlLm5hbWUoKTsK ICAgICB9CiAKLSAgICBjb25zdCBFeHRlbnNpb25NYXAgKmUgPSBleHRlbnNpb25NYXA7Ci0gICAg d2hpbGUgKGUtPmV4dGVuc2lvbikgewotICAgICAgICBpZiAoc3VmZml4ID09IGUtPmV4dGVuc2lv bikKLSAgICAgICAgICAgIHJldHVybiBlLT5taW1lVHlwZTsKLSAgICAgICAgKytlOwotICAgIH0K LQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAogU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6Omdl dE1JTUVUeXBlRm9yUGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCiB7Ci0gICAgUU1pbWVUeXBlIHR5 cGUgPSBRTWltZURhdGFiYXNlKCkubWltZVR5cGVGb3JGaWxlKHBhdGgsIFFNaW1lRGF0YWJhc2U6 Ok1hdGNoRXh0ZW5zaW9uKTsKLSAgICBpZiAodHlwZS5pc1ZhbGlkKCkgJiYgIXR5cGUuaXNEZWZh dWx0KCkpCi0gICAgICAgIHJldHVybiB0eXBlLm5hbWUoKTsKLQogICAgIGNvbnN0IEV4dGVuc2lv bk1hcCAqZSA9IGV4dGVuc2lvbk1hcDsKICAgICB3aGlsZSAoZS0+ZXh0ZW5zaW9uKSB7Ci0gICAg ICAgIGlmIChwYXRoLmVuZHNXaXRoKGUtPmRvdEV4dGVuc2lvbikpCisgICAgICAgIGlmIChwYXRo LmVuZHNXaXRoKGUtPmRvdEV4dGVuc2lvbiwgLyogY2FzZVNlbnNpdGl2ZSAqLyBmYWxzZSkpCiAg ICAgICAgICAgICByZXR1cm4gZS0+bWltZVR5cGU7CiAgICAgICAgICsrZTsKICAgICB9CiAKKyAg ICAvLyBGSVhNRTogU2VlIGNvbW1lbnQgaW4gZ2V0TUlNRVR5cGVGb3JFeHRlbnNpb24uCisgICAg UU1pbWVUeXBlIHR5cGUgPSBRTWltZURhdGFiYXNlKCkubWltZVR5cGVGb3JGaWxlKHBhdGgsIFFN aW1lRGF0YWJhc2U6Ok1hdGNoRXh0ZW5zaW9uKTsKKyAgICBpZiAodHlwZS5pc1ZhbGlkKCkgJiYg IXR5cGUuaXNEZWZhdWx0KCkpCisgICAgICAgIHJldHVybiB0eXBlLm5hbWUoKTsKKwogICAgIHJl dHVybiBkZWZhdWx0TUlNRVR5cGUoKTsKIH0KIAo=