AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of invalid urls in QDataStream << QUrl

Browse Source 
When given an invalid url, the output shouldn't be a valid url.

KDE's kurltest detected this regression compared to Qt4, where
all invalid urls were empty in toString() -- but we don't want that,
to give as much feedback as possible to the user.

Change-Id: Ie53e6e1c0a1d4bb9e12b820220dfb7e2f7753959
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2012-05-22 17:43:50 +02:00 committed by Qt by Nokia
parent 06906ce40d
commit f06b629bfb
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qurl.cpp
View File

@ -2879,7 +2879,9 @@ bool QUrl::isParentOf(const QUrl &childUrl) const
*/
QDataStream &operator<<(QDataStream &out, const QUrl &url)
{
QByteArray u = url.toString(QUrl::FullyEncoded).toLatin1();
QByteArray u;
if (url.isValid())
u = url.toEncoded();
out << u;
return out;
}

34
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -165,6 +165,8 @@ private slots:
void componentEncodings();
void setComponents_data();
void setComponents();
void streaming_data();
void streaming();
};
// Testing get/set functions
@ -3146,5 +3148,37 @@ void tst_QUrl::setComponents()
}
}
void tst_QUrl::streaming_data()
{
QTest::addColumn<QString>("urlStr");
QTest::newRow("origURL") << "http://www.website.com/directory/?#ref";
QTest::newRow("urlWithPassAndNoUser") << "ftp://:password@ftp.kde.org/path";
QTest::newRow("accentuated") << QString::fromUtf8("trash:/été");
QTest::newRow("withPercents") << "http://host/path%25path?%3Fque%25ry#%23ref%25";
QTest::newRow("empty") << "";
QVERIFY(!QUrl("ptal://mlc:usb").isValid());
QTest::newRow("invalid") << "ptal://mlc:usb";
QTest::newRow("ipv6") << "http://[::ffff:129.144.52.38]:81?query";
}
void tst_QUrl::streaming()
{
QFETCH(QString, urlStr);
QUrl url(urlStr);
QByteArray buffer;
QDataStream writeStream( &buffer, QIODevice::WriteOnly );
writeStream << url;
QDataStream stream( buffer );
QUrl restored;
stream >> restored;
if (url.isValid())
QCOMPARE(restored.url(), url.url());
else
QVERIFY(!restored.isValid());
}
QTEST_MAIN(tst_QUrl)
#include "tst_qurl.moc"