145254 2015-05-21 03:23:23 -0700 Fix logical-not-parentheses warning in CachedScript.cpp 2015-06-01 04:37:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 145121 1 ossy ossy commit-queue darin japhet ossy oldest_to_newest 1096541 0 ossy 2015-05-21 03:23:23 -0700 ../../Source/WebCore/loader/cache/CachedScript.cpp:98:12: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses] return !parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); ^ ~~ ../../Source/WebCore/loader/cache/CachedScript.cpp:98:12: note: add parentheses after the '!' to evaluate the comparison first return !parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); ^ ( ) ../../Source/WebCore/loader/cache/CachedScript.cpp:98:12: note: add parentheses around left hand side expression to silence this warning return !parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); ^ ( ) 1 warning generated. ---- It seems this warning found a real bug should be fixed. 1096542 1 253515 ossy 2015-05-21 03:25:35 -0700 Created attachment 253515 Patch 1097132 2 253515 ap 2015-05-23 18:48:37 -0700 Comment on attachment 253515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253515&action=review > Source/WebCore/loader/cache/CachedScript.cpp:98 > + return !(parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); Shouldn't this just use != ? 1097472 3 253515 darin 2015-05-26 14:53:12 -0700 Comment on attachment 253515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253515&action=review >> Source/WebCore/loader/cache/CachedScript.cpp:98 >> + return !(parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); > > Shouldn't this just use != ? I agree that it should. 1097473 4 darin 2015-05-26 14:53:35 -0700 Also, we should test this feature. Now that we know it was broken. 1098464 5 253515 ossy 2015-06-01 02:54:12 -0700 Comment on attachment 253515 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253515&action=review >>> Source/WebCore/loader/cache/CachedScript.cpp:98 >>> + return !(parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) == ContentTypeOptionsNosniff) || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType()); >> >> Shouldn't this just use != ? > > I agree that it should. Good point, I'll change it before landing. 1098465 6 ossy 2015-06-01 03:41:30 -0700 (In reply to comment #4) > Also, we should test this feature. Now that we know it was broken. Source/WebCore/platform/network/HTTPParsers.h: ----------------------------------------------- ... enum ContentTypeOptionsDisposition { ContentTypeOptionsNone, ContentTypeOptionsNosniff }; ... It is already covered by testcases and this code isn't broken functionally, because ContentTypeOptionsNosniff gets 1 value in this enum and we were lucky and got the same results in both cases. X: ContentTypeOptionsNone (0) X: ContentTypeOptionsNosniff (1) !X==1 true false !(X==1) true false X!=1 true false 1098466 7 253991 ossy 2015-06-01 03:47:30 -0700 Created attachment 253991 Patch for landing 1098469 8 ossy 2015-06-01 03:58:44 -0700 ( just a note, it is already fixed in blink near 2 years ago :) https://codereview.chromium.org/18753002 ) 1098476 9 253991 commit-queue 2015-06-01 04:37:04 -0700 Comment on attachment 253991 Patch for landing Clearing flags on attachment: 253991 Committed r185057: <http://trac.webkit.org/changeset/185057> 1098477 10 commit-queue 2015-06-01 04:37:08 -0700 All reviewed patches have been landed. Closing bug. 253515 2015-05-21 03:25:35 -0700 2015-06-01 03:47:23 -0700 Patch bug-145254-20150521032529.patch text/plain 1575 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg5MjAwMTdmMWVkYjFk YmQ2YjRlY2E3NjRjMTE5YTNmYmQ3ODcxNi4uOTM3MjAwNjdmNDdmZGM5NTc3MzgyZTdlYWE2NDcy ZTZiMjllMzQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA1LTIxICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGxvZ2ljYWwt bm90LXBhcmVudGhlc2VzIHdhcm5pbmcgaW4gQ2FjaGVkU2NyaXB0LmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MjU0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVk U2NyaXB0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFNjcmlwdDo6bWltZVR5cGVBbGxv d2VkQnlOb3NuaWZmKTogQWRkZWQgdGhlIG5lY2Vzc2FyeSBwYXJlbnRoZXNlcy4KKwogMjAxNS0w NS0yMSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UHVyZ2UgUGFzc1JlZlB0ciBpbiBXZWJDb3JlL01vZHVsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRTY3JpcHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKaW5kZXggZjhiYzMzYzdiMzI1MWRjNDIzODBmNWM0 NjgzZmY0ZTk0ZTM0OWQ5Mi4uMTVkN2I3ODI2OTY2MWNkNGQ5MDFlYjJjZjhkNTQ1MWY2OTI2YTQ3 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKQEAg LTk1LDcgKzk1LDcgQEAgdm9pZCBDYWNoZWRTY3JpcHQ6OmRlc3Ryb3lEZWNvZGVkRGF0YSgpCiAj aWYgRU5BQkxFKE5PU05JRkYpCiBib29sIENhY2hlZFNjcmlwdDo6bWltZVR5cGVBbGxvd2VkQnlO b3NuaWZmKCkgY29uc3QKIHsKLSAgICByZXR1cm4gIXBhcnNlQ29udGVudFR5cGVPcHRpb25zSGVh ZGVyKG1fcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpYQ29udGVudFR5 cGVPcHRpb25zKSkgPT0gQ29udGVudFR5cGVPcHRpb25zTm9zbmlmZiB8fCBNSU1FVHlwZVJlZ2lz dHJ5Ojppc1N1cHBvcnRlZEphdmFTY3JpcHRNSU1FVHlwZShtaW1lVHlwZSgpKTsKKyAgICByZXR1 cm4gIShwYXJzZUNvbnRlbnRUeXBlT3B0aW9uc0hlYWRlcihtX3Jlc3BvbnNlLmh0dHBIZWFkZXJG aWVsZChIVFRQSGVhZGVyTmFtZTo6WENvbnRlbnRUeXBlT3B0aW9ucykpID09IENvbnRlbnRUeXBl T3B0aW9uc05vc25pZmYpIHx8IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSmF2YVNjcmlw dE1JTUVUeXBlKG1pbWVUeXBlKCkpOwogfQogI2VuZGlmCiAK 253991 2015-06-01 03:47:30 -0700 2015-06-01 04:37:04 -0700 Patch for landing bug-145254-20150601034712.patch text/plain 1545 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVkMzhmNTkwZTc3M2Uw NDhhM2IyMTNjZWViNWYwNjRkM2MzYzU3Mi4uZDA3NWZlODM2Yjc2OWJmZDdmN2U5NWEzZjk4MjBl ZGI3YjMxY2YwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA2LTAxICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGxvZ2ljYWwt bm90LXBhcmVudGhlc2VzIHdhcm5pbmcgaW4gQ2FjaGVkU2NyaXB0LmNwcAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MjU0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRTY3Jp cHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkU2NyaXB0OjptaW1lVHlwZUFsbG93ZWRC eU5vc25pZmYpOiAiIVg9PVkiIHNob3VsZCBiZSAiWCE9WSIgaGVyZS4KKwogMjAxNS0wNS0zMSAg RGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYW50aGVy IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRT Y3JpcHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAK aW5kZXggZjhiYzMzYzdiMzI1MWRjNDIzODBmNWM0NjgzZmY0ZTk0ZTM0OWQ5Mi4uMmY4YWUzYzk1 NDViMjg3ZjJlODEyYzFlNTU3M2RiNmE5MWE0MjU3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFNjcmlwdC5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgdm9pZCBDYWNoZWRT Y3JpcHQ6OmRlc3Ryb3lEZWNvZGVkRGF0YSgpCiAjaWYgRU5BQkxFKE5PU05JRkYpCiBib29sIENh Y2hlZFNjcmlwdDo6bWltZVR5cGVBbGxvd2VkQnlOb3NuaWZmKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gIXBhcnNlQ29udGVudFR5cGVPcHRpb25zSGVhZGVyKG1fcmVzcG9uc2UuaHR0cEhlYWRlckZp ZWxkKEhUVFBIZWFkZXJOYW1lOjpYQ29udGVudFR5cGVPcHRpb25zKSkgPT0gQ29udGVudFR5cGVP cHRpb25zTm9zbmlmZiB8fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEphdmFTY3JpcHRN SU1FVHlwZShtaW1lVHlwZSgpKTsKKyAgICByZXR1cm4gcGFyc2VDb250ZW50VHlwZU9wdGlvbnNI ZWFkZXIobV9yZXNwb25zZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OlhDb250ZW50 VHlwZU9wdGlvbnMpKSAhPSBDb250ZW50VHlwZU9wdGlvbnNOb3NuaWZmIHx8IE1JTUVUeXBlUmVn aXN0cnk6OmlzU3VwcG9ydGVkSmF2YVNjcmlwdE1JTUVUeXBlKG1pbWVUeXBlKCkpOwogfQogI2Vu ZGlmCiAK