Changeset 47221 in webkit

Timestamp:

Aug 13, 2009 11:21:32 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-13 Steve Block <​steveblock@google.com>

Reviewed by Darin Adler.

Fixes a couple of bugs in SecurityOrigin::createFromDatabaseIdentifier.
​https://bugs.webkit.org/show_bug.cgi?id=28262

No new tests possible.

• page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::createFromDatabaseIdentifier):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/SecurityOrigin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-13  Steve Block  <steveblock@google.com>
+
+        Reviewed by Darin Adler.
+
+        Fixes a couple of bugs in SecurityOrigin::createFromDatabaseIdentifier.
+        https://bugs.webkit.org/show_bug.cgi?id=28262
+
+        No new tests possible.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::createFromDatabaseIdentifier):
+
 2009-08-13  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/page/SecurityOrigin.cpp

@@ -282 +282 @@
         return create(KURL());
         
-    // Ensure there were at least 2 seperator characters. Some hostnames on intranets have
+    // Ensure there were at least 2 separator characters. Some hostnames on intranets have
     // underscores in them, so we'll assume that any additional underscores are part of the host.
-    if (separator1 != separator2)
+    if (separator1 == separator2)
         return create(KURL());
         
@@ -290 +290 @@
     bool portOkay;
     int port = databaseIdentifier.right(databaseIdentifier.length() - separator2 - 1).toInt(&portOkay);
-    if (!portOkay && separator2 + 1 == static_cast<int>(databaseIdentifier.length()))
+    bool portAbsent = (separator2 == static_cast<int>(databaseIdentifier.length()) - 1);
+    if (!(portOkay || portAbsent))
         return create(KURL());