Changeset 217908 in webkit


Ignore:
Timestamp:
Jun 7, 2017 3:26:48 PM (7 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] additionalReadAccessAllowedURLs should be consumed before loading the injected bundle
https://bugs.webkit.org/show_bug.cgi?id=173078

Reviewed by Anders Carlsson.

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess): Changed the order.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r217886 r217908  
     12017-06-07  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] additionalReadAccessAllowedURLs should be consumed before loading the injected bundle
     4        https://bugs.webkit.org/show_bug.cgi?id=173078
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebProcess/WebProcess.cpp:
     9        (WebKit::WebProcess::initializeWebProcess): Changed the order.
     10
    1112017-06-07  Per Arne Vollan  <pvollan@apple.com>
    212
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r217886 r217908  
    292292    }
    293293
     294    for (size_t i = 0, size = parameters.additionalSandboxExtensionHandles.size(); i < size; ++i)
     295        SandboxExtension::consumePermanently(parameters.additionalSandboxExtensionHandles[i]);
     296
    294297    if (!parameters.injectedBundlePath.isEmpty())
    295298        m_injectedBundle = InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
    296 
    297     for (size_t i = 0, size = parameters.additionalSandboxExtensionHandles.size(); i < size; ++i)
    298         SandboxExtension::consumePermanently(parameters.additionalSandboxExtensionHandles[i]);
    299299
    300300    for (auto& supplement : m_supplements.values())
Note: See TracChangeset for help on using the changeset viewer.