Title: [168238] branches/safari-537.76-branch/Source/WebCore
- Revision
- 168238
- Author
- bshaf...@apple.com
- Date
- 2014-05-03 20:49:10 -0700 (Sat, 03 May 2014)
Log Message
Follow-up fix for the merge of r167480.
Rubber stamped by Tim Horton.
* platform/KURL.cpp:
(WebCore::KURL::host): Return empty string instead of null string.
Modified Paths
Diff
Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168237 => 168238)
--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-04 03:43:19 UTC (rev 168237)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-04 03:49:10 UTC (rev 168238)
@@ -1,3 +1,12 @@
+2014-05-03 Babak Shafiei <bshaf...@apple.com>
+
+ Follow-up fix for the merge of r167480.
+
+ Rubber stamped by Tim Horton.
+
+ * platform/KURL.cpp:
+ (WebCore::KURL::host): Return empty string instead of null string.
+
2014-05-02 Matthew Hanson <matthew_han...@apple.com>
Merge r166420.
Modified: branches/safari-537.76-branch/Source/WebCore/platform/KURL.cpp (168237 => 168238)
--- branches/safari-537.76-branch/Source/WebCore/platform/KURL.cpp 2014-05-04 03:43:19 UTC (rev 168237)
+++ branches/safari-537.76-branch/Source/WebCore/platform/KURL.cpp 2014-05-04 03:49:10 UTC (rev 168238)
@@ -579,7 +579,8 @@
String KURL::host() const
{
int start = hostStart();
- return m_string.substring(start, m_hostEnd - start);
+ String substring = m_string.substring(start, m_hostEnd - start);
+ return substring.isNull() ? emptyString() : substring;
}
unsigned short KURL::port() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
