diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/platform/KURLGoogle.cpp | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/platform/KURLGoogle.cpp')
| -rw-r--r-- | WebCore/platform/KURLGoogle.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/KURLGoogle.cpp b/WebCore/platform/KURLGoogle.cpp index 97446bd..b4c84a6 100644 --- a/WebCore/platform/KURLGoogle.cpp +++ b/WebCore/platform/KURLGoogle.cpp @@ -1144,8 +1144,10 @@ bool protocolHostAndPortAreEqual(const KURL& a, const KURL& b) return false; int hostStartA = a.hostStart(); + int hostLengthA = a.hostEnd() - hostStartA; int hostStartB = b.hostStart(); - if (a.hostEnd() - hostStartA != b.hostEnd() - hostStartB) + int hostLengthB = b.hostEnd() - b.hostStart(); + if (hostLengthA != hostLengthB) return false; // Check the scheme @@ -1154,8 +1156,8 @@ bool protocolHostAndPortAreEqual(const KURL& a, const KURL& b) return false; // And the host - for (int i = hostStartA; i < static_cast<int>(a.hostEnd()); ++i) - if (a.string()[i] != b.string()[i]) + for (int i = 0; i < hostLengthA; ++i) + if (a.string()[hostStartA + i] != b.string()[hostStartB + i]) return false; if (a.port() != b.port()) |