diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-06-19 10:24:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 01:50:37 +0200 |
| commit | 2c4595ad02ff35011c24ea71c193d5a9710bec30 (patch) | |
| tree | a6eb3d3da97e2aafd3fff03de22b1d884bdd2d25 /src/qml/qml | |
| parent | 2753e9a795537df10c5a3b64ec9f6d8d81381837 (diff) | |
Decode directory separators in source URLs
URLs with encoded directory-separator characters are not correctly
processed by QUrl.
Task-number: QTBUG-25981
Change-Id: I78173ef44c4850774b56753335bea34db04c0735
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcompiler.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 10 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp index 2bb99ddbab..13ff9e81e3 100644 --- a/src/qml/qml/qqmlcompiler.cpp +++ b/src/qml/qml/qqmlcompiler.cpp @@ -515,6 +515,8 @@ void QQmlCompiler::genLiteralAssignment(QQmlScript::Property *prop, { Instruction::StoreUrl instr; QString string = v->value.asString(); + // Encoded dir-separators defeat QUrl processing - decode them first + string.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); QUrl u = string.isEmpty() ? QUrl() : output->url.resolved(QUrl(string)); instr.propertyIndex = prop->index; instr.value = output->indexForUrl(u); diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 33f860fb17..d0c2761373 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1319,10 +1319,16 @@ bool QQmlPropertyPrivate::write(QObject *object, u = value.toUrl(); found = true; } else if (variantType == QVariant::ByteArray) { - u = QUrl(QString::fromUtf8(value.toByteArray())); + QString input(QString::fromUtf8(value.toByteArray())); + // Encoded dir-separators defeat QUrl processing - decode them first + input.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); + u = QUrl(input); found = true; } else if (variantType == QVariant::String) { - u = QUrl(value.toString()); + QString input(value.toString()); + // Encoded dir-separators defeat QUrl processing - decode them first + input.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); + u = QUrl(input); found = true; } diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index ff16f3b95b..7d42b47d53 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -1296,7 +1296,9 @@ void QV4Bindings::run(int instrIndex, quint32 &executedBlocks, if (src.isUndefined()) { output.setUndefined(); } else { - const QString tmp(*src.getstringptr()); + QString tmp(*src.getstringptr()); + // Encoded dir-separators defeat QUrl processing - decode them first + tmp.replace(QLatin1String("%2f"), QLatin1String("/"), Qt::CaseInsensitive); if (instr->unaryop.src == instr->unaryop.output) { output.cleanupString(); MARK_CLEAN_REGISTER(instr->unaryop.output); @@ -1326,7 +1328,7 @@ void QV4Bindings::run(int instrIndex, quint32 &executedBlocks, COLOR_REGISTER(instr->unaryop.output); } } - QML_V4_END_INSTR(ConvertStringToUrl, unaryop) + QML_V4_END_INSTR(ConvertStringToColor, unaryop) QML_V4_BEGIN_INSTR(ConvertStringToVariant, unaryop) { |