From 88f3b059a935d1ce7735a5ae082c256619eea8c1 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 8 Jun 2011 14:24:17 +0200
Subject: Avoid out of bounds write

Reviewed-by: Samuel
---
 src/gui/kernel/qguiapplication.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

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");
-- 
cgit v1.2.3