1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 4d2f9562575..2a8af012a4f 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -298,7 +298,7 @@ Ice::CommunicatorI::removeAdminFacet(const string& facet)
     return _instance->removeAdminFacet(facet);
 }
 
-Ice::CommunicatorI::CommunicatorI(const InitializationData& initData)
+Ice::CommunicatorI::CommunicatorI(const InitializationData& initData, char** argv) : _argv(argv)
 {
     __setNoDelete(true);
     try
@@ -358,6 +358,16 @@ Ice::CommunicatorI::~CommunicatorI()
         Warning out(_instance->initializationData().logger);
         out << "Ice::Communicator::destroy() has not been called";
     }
+    if(_argv)
+    {
+        for(int i = 0; _argv[i] != 0; ++i)
+        {
+            free(_argv[i]);
+        }
+        free(_argv);
+        _argv = 0;
+    }
+
 }
 
 void