From 500794cbeb3d9847c8bf97e5c6ef575d74fc8453 Mon Sep 17 00:00:00 2001
From: Alexey Shilov <alexey.shilov@nokia.com>
Date: Thu, 12 May 2011 11:56:15 +0300
Subject: [PATCH] Fixes: NB#254878 - COREWEB: /usr/bin/camera-ui.launch
 'AppData::deleteArgv Booster::launchProcess' RevBy: Pertti Kellomaki

---
 debian/changelog            |  1 +
 src/launcherlib/appdata.cpp | 16 ----------------
 src/launcherlib/appdata.h   |  3 ---
 src/launcherlib/booster.cpp |  1 -
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30ce5a8..bb9da4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 applauncherd (0.29.6) unstable; urgency=low
 
   * Changes: Added a command to run cpu in full speed to perf tests
+  * Fixes: NB#254878 - COREWEB: /usr/bin/camera-ui.launch 'AppData::deleteArgv Booster::launchProcess' 
 
  -- Nimika Keshri <nimika.1.keshri@nokia.com>  Thu, 12 May 2011 11:34:15 +0300
 
diff --git a/src/launcherlib/appdata.cpp b/src/launcherlib/appdata.cpp
index f6eecc4..3660ac2 100644
--- a/src/launcherlib/appdata.cpp
+++ b/src/launcherlib/appdata.cpp
@@ -190,21 +190,6 @@ gid_t AppData::groupId() const
     return m_gid;
 }
 
-void AppData::deleteArgv()
-{
-    if (m_argv)
-    {
-        for (int i = 0; i < m_argc; i++)
-        {
-            delete [] m_argv[i];
-            m_argv[i] = NULL;
-        }
-
-        delete [] m_argv;
-        m_argv = NULL;
-    }
-}
-
 #if defined (HAVE_CREDS)
 void AppData::setPeerCreds(creds_t peerCreds)
 {
@@ -225,7 +210,6 @@ void AppData::deletePeerCreds()
 
 AppData::~AppData()
 {
-    deleteArgv();
 #if defined (HAVE_CREDS)
     deletePeerCreds();
 #endif
diff --git a/src/launcherlib/appdata.h b/src/launcherlib/appdata.h
index dfd9c65..d080c49 100644
--- a/src/launcherlib/appdata.h
+++ b/src/launcherlib/appdata.h
@@ -134,9 +134,6 @@ public:
     //! Get group ID of calling process
     gid_t groupId() const;
 
-    //! Frees the memory reserved for argv
-    void deleteArgv();
-
 #if defined (HAVE_CREDS)
     //! Store security credentials
     void setPeerCreds(creds_t peerCreds);
diff --git a/src/launcherlib/booster.cpp b/src/launcherlib/booster.cpp
index f736aa5..8a64654 100644
--- a/src/launcherlib/booster.cpp
+++ b/src/launcherlib/booster.cpp
@@ -536,7 +536,6 @@ int Booster::launchProcess()
 
     // Jump to main()
     const int retVal = m_appData->entry()(m_appData->argc(), const_cast<char **>(m_appData->argv()));
-    m_appData->deleteArgv();
     dlclose(handle);
     return retVal;
 }