Title: [130240] trunk/Source/WebKit2
- Revision
- 130240
- Author
- m...@apple.com
- Date
- 2012-10-02 17:42:20 -0700 (Tue, 02 Oct 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (130239 => 130240)
--- trunk/Source/WebKit2/ChangeLog 2012-10-03 00:34:46 UTC (rev 130239)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-03 00:42:20 UTC (rev 130240)
@@ -1 +1,13 @@
+2012-10-02 Dan Bernstein <m...@apple.com>
+
+ 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.
+
== Rolled over to ChangeLog-2012-10-02 ==
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm (130239 => 130240)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-10-03 00:34:46 UTC (rev 130239)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-10-03 00:42:20 UTC (rev 130240)
@@ -84,9 +84,10 @@
}
String localization = commandLine["localization"];
- RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
- if (cfLocalization)
+ if (!localization.isEmpty()) {
+ RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
WKSetDefaultLocalization(cfLocalization.get());
+ }
#if defined(__i386__)
{
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (130239 => 130240)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2012-10-03 00:34:46 UTC (rev 130239)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2012-10-03 00:42:20 UTC (rev 130240)
@@ -161,9 +161,10 @@
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
String localization = commandLine["localization"];
- RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
- if (cfLocalization)
+ if (!localization.isEmpty()) {
+ RetainPtr<CFStringRef> cfLocalization(AdoptCF, CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(localization.characters()), localization.length()));
WKSetDefaultLocalization(cfLocalization.get());
+ }
[pool drain];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
