Title: [136687] trunk
- Revision
- 136687
- Author
- [email protected]
- Date
- 2012-12-05 07:43:14 -0800 (Wed, 05 Dec 2012)
Log Message
Tools: [WK2] InjectedBundle should check Intent url for null
https://bugs.webkit.org/show_bug.cgi?id=104117
Patch by Jussi Kukkonen <[email protected]> on 2012-12-05
Reviewed by Kenneth Rohde Christiansen.
WKIntentServiceInfoCopyHref() can return null, we need to check
for that in InjectedBundlePage::registerIntentServiceForFrame()
to avoid crashing.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::registerIntentServiceForFrame):
LayoutTests: [EFL] InjectedBundle should check Intent url for null
https://bugs.webkit.org/show_bug.cgi?id=104117
Patch by Jussi Kukkonen <[email protected]> on 2012-12-05
Reviewed by Kenneth Rohde Christiansen.
EFL is slightly more verbose than chromium on this one.
* platform/efl/fast/images/crossfade-client-not-removed-crash-expected.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (136686 => 136687)
--- trunk/LayoutTests/ChangeLog 2012-12-05 15:37:44 UTC (rev 136686)
+++ trunk/LayoutTests/ChangeLog 2012-12-05 15:43:14 UTC (rev 136687)
@@ -1,3 +1,14 @@
+2012-12-05 Jussi Kukkonen <[email protected]>
+
+ [EFL] InjectedBundle should check Intent url for null
+ https://bugs.webkit.org/show_bug.cgi?id=104117
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ EFL is slightly more verbose than chromium on this one.
+
+ * platform/efl/fast/images/crossfade-client-not-removed-crash-expected.txt: Added.
+
2012-12-05 Antoine Quint <[email protected]>
TextTrackCue's .endTime property should fire a TypeError when NaN is assigned
Added: trunk/LayoutTests/platform/efl/fast/images/crossfade-client-not-removed-crash-expected.txt (0 => 136687)
--- trunk/LayoutTests/platform/efl/fast/images/crossfade-client-not-removed-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl/fast/images/crossfade-client-not-removed-crash-expected.txt 2012-12-05 15:43:14 UTC (rev 136687)
@@ -0,0 +1,3 @@
+Registered Web Intent Service: action= "" title= url= ""
+Blocked access to external URL http://-4294967295/
+PASS. WebKit didn't crash.
Modified: trunk/Tools/ChangeLog (136686 => 136687)
--- trunk/Tools/ChangeLog 2012-12-05 15:37:44 UTC (rev 136686)
+++ trunk/Tools/ChangeLog 2012-12-05 15:43:14 UTC (rev 136687)
@@ -1,3 +1,17 @@
+2012-12-05 Jussi Kukkonen <[email protected]>
+
+ [WK2] InjectedBundle should check Intent url for null
+ https://bugs.webkit.org/show_bug.cgi?id=104117
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ WKIntentServiceInfoCopyHref() can return null, we need to check
+ for that in InjectedBundlePage::registerIntentServiceForFrame()
+ to avoid crashing.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::registerIntentServiceForFrame):
+
2012-12-04 Jonathan Dong <[email protected]>
Change email address of Jonathan Dong
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (136686 => 136687)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-12-05 15:37:44 UTC (rev 136686)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-12-05 15:43:14 UTC (rev 136687)
@@ -640,7 +640,8 @@
InjectedBundle::shared().stringBuilder()->append(toWTFString(wkTitle.get()));
InjectedBundle::shared().stringBuilder()->appendLiteral(" url=""
WKRetainPtr<WKURLRef> wkUrl(AdoptWK, WKIntentServiceInfoCopyHref(serviceInfo));
- InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKURLCopyString(wkUrl.get()))));
+ if (wkUrl)
+ InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKURLCopyString(wkUrl.get()))));
InjectedBundle::shared().stringBuilder()->appendLiteral(" disposition=");
WKRetainPtr<WKStringRef> wkDisposition(AdoptWK, WKIntentServiceInfoCopyDisposition(serviceInfo));
InjectedBundle::shared().stringBuilder()->append(toWTFString(wkDisposition.get()));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
