diff -r 3b1da2848fc7 -r d3bac044e0f0 src/corelib/io/qurl.cpp --- a/src/corelib/io/qurl.cpp Fri Feb 19 23:40:16 2010 +0200 +++ b/src/corelib/io/qurl.cpp Fri Mar 12 15:46:37 2010 +0200 @@ -3241,8 +3241,11 @@ while (1) { int idx = nextDotDelimiter(domain, lastIdx); int labelLength = idx - lastIdx; - if (labelLength == 0) + if (labelLength == 0) { + if (idx == domain.length()) + break; return QString(); // two delimiters in a row -- empty label not allowed + } // RFC 3490 says, about the ToASCII operation: // 3. If the UseSTD3ASCIIRules flag is set, then perform these checks: @@ -5932,7 +5935,7 @@ */ bool QUrl::isDetached() const { - return d && d->ref == 1; + return !d || d->ref == 1; }