Title: [147671] trunk/Source/WebCore
- Revision
- 147671
- Author
- [email protected]
- Date
- 2013-04-04 14:57:58 -0700 (Thu, 04 Apr 2013)
Log Message
REGRESSION (r146580): Assertion using SecurityOrigin::create, URL string is not valid
https://bugs.webkit.org/show_bug.cgi?id=113961
Reviewed by Geoff Garen.
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::createFromDatabaseIdentifier):
(WebCore::SecurityOrigin::create):
Don't use ParsedURLString, because http://host:80/ is normalized to http://host/,
so it's not a parsed URL string.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147670 => 147671)
--- trunk/Source/WebCore/ChangeLog 2013-04-04 21:25:26 UTC (rev 147670)
+++ trunk/Source/WebCore/ChangeLog 2013-04-04 21:57:58 UTC (rev 147671)
@@ -1,3 +1,16 @@
+2013-04-04 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r146580): Assertion using SecurityOrigin::create, URL string is not valid
+ https://bugs.webkit.org/show_bug.cgi?id=113961
+
+ Reviewed by Geoff Garen.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::createFromDatabaseIdentifier):
+ (WebCore::SecurityOrigin::create):
+ Don't use ParsedURLString, because http://host:80/ is normalized to http://host/,
+ so it's not a parsed URL string.
+
2013-04-04 Sheriff Bot <[email protected]>
Unreviewed, rolling out r147662.
Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (147670 => 147671)
--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2013-04-04 21:25:26 UTC (rev 147670)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2013-04-04 21:57:58 UTC (rev 147671)
@@ -529,7 +529,7 @@
String host = databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1);
host = decodeURLEscapeSequences(host);
- return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port) + "/"));
+ return create(KURL(KURL(), protocol + "://" + host + ":" + String::number(port) + "/"));
}
PassRefPtr<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, int port)
@@ -537,7 +537,7 @@
if (port < 0 || port > MaxAllowedPort)
createUnique();
String decodedHost = decodeURLEscapeSequences(host);
- return create(KURL(ParsedURLString, protocol + "://" + host + ":" + String::number(port) + "/"));
+ return create(KURL(KURL(), protocol + "://" + host + ":" + String::number(port) + "/"));
}
String SecurityOrigin::databaseIdentifier() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
