Changeset 72115 in webkit

Timestamp:

Nov 16, 2010 10:15:19 AM (13 years ago)

Author:

Darin Adler

Message:

2010-11-16 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

​https://bugs.webkit.org/show_bug.cgi?id=48603
Boolean logic mistake in local file check

• loader/FrameLoader.cpp: (WebCore::FrameLoader::loadFrameRequest): Fix logic so that both checks have to pass before accepting a local file load.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48603
+        Boolean logic mistake in local file check
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadFrameRequest): Fix logic so that both checks have to pass
+        before accepting a local file load.
+
 2010-11-15  Darin Adler  <darin@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1257 +1257 @@
     // FIXME: Should we move the isFeedWithNestedProtocolInHTTPFamily logic inside SecurityOrigin::canDisplay?
     if (!isFeedWithNestedProtocolInHTTPFamily(url)) {
-        if (!frame()->document()->securityOrigin()->canDisplay(url) && !SecurityOrigin::deprecatedCanDisplay(referrer, url)) {
+        if (!(frame()->document()->securityOrigin()->canDisplay(url) && SecurityOrigin::deprecatedCanDisplay(referrer, url))) {
             reportLocalLoadFailed(m_frame, url.string());
             return;