summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-08 14:24:17 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-06-08 14:46:50 +0200
commit88f3b059a935d1ce7735a5ae082c256619eea8c1 (patch)
tree875e075b246f443c6860e051b4d24bf87d49644d
parent2d09fe38ac9dd698d2259d9f0c973a82bf3b26c0 (diff)
Avoid out of bounds write
Reviewed-by: Samuel
-rw-r--r--src/gui/kernel/qguiapplication.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index e04068e626..80b4aa3206 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -287,8 +287,10 @@ void QGuiApplicationPrivate::init()
}
}
- argv[j] = 0;
- argc = j;
+ if (j < argc) {
+ argv[j] = 0;
+ argc = j;
+ }
#if 0
QByteArray pluginEnv = qgetenv("QT_QPA_PLUGINS");