summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2017-06-20 06:28:17 +0200
committerAndy Shaw <andy.shaw@qt.io>2017-06-20 06:43:31 +0000
commit5d8d01b87c20569fd2a7389c199e7db14ba52d11 (patch)
tree75443fe448f07230b25a7a8abba44a0874346da5
parentcd2e41ee7935c515addfd3128824ffd0a53aaf5a (diff)
downloadqtactiveqt-5d8d01b87c20569fd2a7389c199e7db14ba52d11.tar.gz
Fix infinite loop in MIME classinfo parser in ActiveQt
This is the same change as dd0feaa95a4c3e186c18bab16db5552bb8efc2db but done in the other location where the same loop is handled in the same manner. Change-Id: I86773b1ed5c9ac7bd23974e9eefcb89f7b515014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/activeqt/control/qaxserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index b3c11db..6985cdd 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -420,7 +420,7 @@ HRESULT UpdateRegistry(BOOL bRegister)
QString extension;
while (mime.contains(QLatin1Char(':'))) {
extension = mime.mid(mime.lastIndexOf(QLatin1Char(':')) + 1);
- mime.chop(extension.length() - 1);
+ mime.chop(extension.length() + 1);
// Prepend '.' before extension, if required.
extension = extension.trimmed();
if (extension[0] != dot)