diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-30 14:47:57 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-30 14:47:57 +0000 |
| commit | c31a631822d3644138945e975401844472dc792c (patch) | |
| tree | 53ebf5a6d7de51b9b2a2c520e3f3df874990060c | |
| parent | 208558a2c61a01d09ef504e4ada2fb22a59ad081 (diff) | |
| download | ATCD-c31a631822d3644138945e975401844472dc792c.tar.gz | |
Wed Jun 30 14:38:33 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
Fixed potential crash when a nonexistant instance reference is
provided.
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 1d5bfe69fb0..c7072c07cff 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 30 14:38:33 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + + Fixed potential crash when a nonexistant instance reference is + provided. + Wed Jun 30 13:33:21 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp index 945a4a8e778..644db408a8e 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp @@ -49,6 +49,16 @@ namespace CIAO ACE_TEXT ("Interceptor post install for instance %C\n"), plan.instance[instance_index].name.in ())); + if (&instance_reference == 0) + { + DANCE_ERROR (3, (LM_WARNING, DLINFO + ACE_TEXT ("CIAO_StoreReferences_i::instance_post_install - ") + ACE_TEXT ("Got a nil instance_reference, unable to store reference ") + ACE_TEXT ("for instance <%C>\n"), + inst.name.in ())); + return; + } + for (CORBA::ULong i = 0; i < inst.configProperty.length (); ++i) |