summaryrefslogtreecommitdiffstats
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-21 07:48:07 +0000
commitddf9740b3df51078d879b9b577d0a722b4da57a4 (patch)
treea453e538d3ac250578b84d00f350a88b30d08e1f
parent2fbd30b1de6abcb7b660083dde120c8b03a3abbc (diff)
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> (cherry picked from commit 5d8d01b87c20569fd2a7389c199e7db14ba52d11)
-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 35a32dd..1d34e00 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)