Changeset 125176 in webkit


Ignore:
Timestamp:
Aug 9, 2012, 9:10:45 AM (13 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/12035637> 32-bit PluginProcess launches without appropriate DYLD environment variables if UI process is 64-bit only
​https://bugs.webkit.org/show_bug.cgi?id=93596

Reviewed by Mark Rowe.

  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess): Changed to pass the current architecture, rather than
the intended child process architecture, to the DynamicLinkerEnvironmentExtractor constructor.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r125156 r125176  
     12012-08-09  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/12035637> 32-bit PluginProcess launches without appropriate DYLD environment variables if UI process is 64-bit only
     4        https://bugs.webkit.org/show_bug.cgi?id=93596
     5
     6        Reviewed by Mark Rowe.
     7
     8        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
     9        (WebKit::ProcessLauncher::launchProcess): Changed to pass the current architecture, rather than
     10        the intended child process architecture, to the DynamicLinkerEnvironmentExtractor constructor.
     11
    1122012-08-09  Tim Horton  <timothy_horton@apple.com>
    213

  • trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r122400 r125176  
    170170
    171171#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
    172         DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], architecture);
     172        DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
    173173        environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
    174174#endif
Note: See TracChangeset for help on using the changeset viewer.