diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-02 13:31:40 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-02 13:31:40 +0000 |
| commit | 1c29ac9c27df8fab70269167f75eb7c4fc7f0088 (patch) | |
| tree | bcee705934f9bcf2ab174b91cbf1ec4b30111467 /TAO/tao/PortableServer/Root_POA.cpp | |
| parent | 5b7f44afd5e2c7250553bc00f88435dbaefd78b7 (diff) | |
| download | ATCD-1c29ac9c27df8fab70269167f75eb7c4fc7f0088.tar.gz | |
Mon Feb 2 13:30:17 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/PortableServer/Root_POA.cpp (check_for_valid_wait_for_completions):
Also check whether the poa member is not zero, when retrieving the
orb_core we use that pointer and could crash if it is zero
* tao/PortableServer/POA_Current_Impl.h:
Doxygen change
Diffstat (limited to 'TAO/tao/PortableServer/Root_POA.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Root_POA.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 7f0c657d4b7..0da5fbea110 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -1237,7 +1237,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core // belonging to the same ORB as this POA, the BAD_INV_ORDER // system exception with standard minor code 3 is raised and // POA destruction does not occur. - if (poa_current_impl != 0) + if ((poa_current_impl != 0) && (poa_current_impl->poa () != 0)) { if (&orb_core == &poa_current_impl->orb_core ()) { |