summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Application.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2010-01-05 16:10:23 +1000
committerMichi Henning <michi@zeroc.com>2010-01-05 16:10:23 +1000
commit2d19243542acfb6985e289a4717381f9c1a020ac (patch)
tree73dde56e429a7a1a6a69af3123278909223373a8 /cpp/src/Ice/Application.cpp
parentbug 4575 - README.Linux-RPM errata (diff)
downloadice-2d19243542acfb6985e289a4717381f9c1a020ac.tar.bz2
ice-2d19243542acfb6985e289a4717381f9c1a020ac.tar.xz
ice-2d19243542acfb6985e289a4717381f9c1a020ac.zip
Bug 4578: Application::main not safe
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
-rw-r--r--cpp/src/Ice/Application.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index a0598649082..4f2e7a61a2b 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -613,7 +613,11 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
try
{
IceInternal::Application::_interrupted = false;
- IceInternal::Application::_appName = argv[0] ? argv[0] : "";
+ IceInternal::Application::_appName = "";
+ if(argc > 0)
+ {
+ IceInternal::Application::_appName = argv[0];
+ }
//
// We parse the properties here to extract Ice.ProgramName.