osaf/libs/agents/saf/imma/imma_oi_api.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
If mmsv_om_handle_initialize returns non SA_AIS_OK then instead of a
goto to the 'done' point, we do a goto to 'lock_failed'. The client
is not locked in this context.
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
@@ -3517,7 +3517,7 @@ SaAisErrorT saImmOiAugmentCcbInitialize(
if(rc != SA_AIS_OK) {
TRACE("ERR_TRY_AGAIN: failed to obtain internal om
handle rc:%u", rc);
rc = SA_AIS_ERR_TRY_AGAIN;
- goto done;
+ goto lock_fail; /* We are not locked and nothing to
de-allocate. */
}
osafassert(m_NCS_LOCK(&cb->cb_lock, NCS_LOCK_WRITE) ==
NCSCC_RC_SUCCESS);
------------------------------------------------------------------------------
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
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
