osaf/services/saf/clmsv/nodeagent/main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
During opensaf startup, when clmna talks to CLMS, the MDS send may timeout
in some situations, there is a double free in the case when send timesout.
The patch avoids theis double free.
diff --git a/osaf/services/saf/clmsv/nodeagent/main.c
b/osaf/services/saf/clmsv/nodeagent/main.c
--- a/osaf/services/saf/clmsv/nodeagent/main.c
+++ b/osaf/services/saf/clmsv/nodeagent/main.c
@@ -504,6 +504,7 @@ void clmna_process_mbx(SYSF_MBX *mbx)
/* NID will anyway stop and retry */
LOG_ER("Exiting");
free(msg);
+ msg = NULL;
} else
goto done;
}
@@ -513,7 +514,8 @@ void clmna_process_mbx(SYSF_MBX *mbx)
break;
}
done:
-free(msg);
+if (msg)
+ free(msg);
TRACE_LEAVE();
}
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
