Ack from me. /AndersBj
-----Original Message----- From: [email protected] [mailto:[email protected]] Sent: den 19 september 2014 14:35 To: Anders Björnerstedt; Zoran Milinkovic Cc: [email protected] Subject: [PATCH 1 of 1] imm:corrected missing cl_node NULL check for imma resurrect [#1094] osaf/libs/agents/saf/imma/imma_oi_api.c | 4 +++- osaf/libs/agents/saf/imma/imma_om_api.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.c b/osaf/libs/agents/saf/imma/imma_oi_api.c --- a/osaf/libs/agents/saf/imma/imma_oi_api.c +++ b/osaf/libs/agents/saf/imma/imma_oi_api.c @@ -3140,7 +3140,9 @@ int imma_oi_resurrect(IMMA_CB *cb, IMMA_ TRACE_3("client_node_get failed"); } - timeout = cl_node->syncr_timeout; + if(cl_node) { + timeout = cl_node->syncr_timeout; + } m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE); *locked = false; diff --git a/osaf/libs/agents/saf/imma/imma_om_api.c b/osaf/libs/agents/saf/imma/imma_om_api.c --- a/osaf/libs/agents/saf/imma/imma_om_api.c +++ b/osaf/libs/agents/saf/imma/imma_om_api.c @@ -8212,7 +8212,11 @@ int imma_om_resurrect(IMMA_CB *cb, IMMA_ } else { TRACE_3("client_node_get failed"); } - timeout = cl_node->syncr_timeout; + + if (cl_node) { + timeout = cl_node->syncr_timeout; + } + m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE); *locked = false; cl_node = NULL; ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that Matters. http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
