Changeset 130240 in webkit


Ignore:
Timestamp:
Oct 2, 2012, 5:42:20 PM (13 years ago)
Author:
mitz@apple.com
Message:

Fixed a crash when the localization option is not passed to the web process.

Reviewed by Sam Weinig.

  • PluginProcess/mac/PluginProcessMainMac.mm:

(WebKit::PluginProcessMain): Changed to not call WKSetDefaultLocalization
with the empty string.

  • WebProcess/mac/WebProcessMainMac.mm:

(WebKit::WebProcessMain): Ditto.

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r130237 r130240  
     12012-10-02  Dan Bernstein  <mitz@apple.com>
     2
     3        Fixed a crash when the localization option is not passed to the web process.
     4
     5        Reviewed by Sam Weinig.
     6
     7        * PluginProcess/mac/PluginProcessMainMac.mm:
     8        (WebKit::PluginProcessMain): Changed to not call WKSetDefaultLocalization
     9        with the empty string.
     10        * WebProcess/mac/WebProcessMainMac.mm:
     11        (WebKit::WebProcessMain): Ditto.
     12
    113== Rolled over to ChangeLog-2012-10-02 ==

  • trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm

    r128236 r130240  
    8585
    8686    String localization = commandLine["localization"];
    87     RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
    88     if (cfLocalization)
     87    if (!localization.isEmpty()) {
     88        RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
    8989        WKSetDefaultLocalization(cfLocalization.get());
     90    }
    9091
    9192#if defined(__i386__)

  • trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm

    r128021 r130240  
    162162
    163163    String localization = commandLine["localization"];
    164     RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
    165     if (cfLocalization)
     164    if (!localization.isEmpty()) {
     165        RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
    166166        WKSetDefaultLocalization(cfLocalization.get());
     167    }
    167168
    168169    [pool drain];
Note: See TracChangeset for help on using the changeset viewer.