summaryrefslogtreecommitdiff
path: root/ace/Service_Repository.cpp
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-17 15:33:41 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-17 15:33:41 +0000
commit0c91c29b495bcb3e348f8cb29a570f33caa35b83 (patch)
treeea14c60bb2af0ff2638df2ff01c90f67707ecfcc /ace/Service_Repository.cpp
parentfa6d78021962cb65a54d75821182314395e20eaf (diff)
downloadATCD-0c91c29b495bcb3e348f8cb29a570f33caa35b83.tar.gz
Forgot to check for null pointer in find_i.
Diffstat (limited to 'ace/Service_Repository.cpp')
-rw-r--r--ace/Service_Repository.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 0db2df28a47..43711da3b7d 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -209,13 +209,15 @@ ACE_Service_Repository::find_i (const ASYS_TCHAR name[],
if (i < this->current_size_)
{
- if (srp != 0)
- *srp = this->service_vector_[i];
- if ((*srp)->fini_called ())
+ if (this->service_vector_[i]->fini_called ())
{
- *srp = 0;
+ if (srp != 0)
+ *srp = 0;
return -1;
}
+
+ if (srp != 0)
+ *srp = this->service_vector_[i];
if (ignore_suspended
&& this->service_vector_[i]->active () == 0)
return -2;