Re: [devel] [PATCH 1/1] log: fix memory leak that was introduced in 3116 [#3138]

[Gary Lee]

Hi Vu

ack (review only)

________________________________
From: Vu Minh Nguyen <vu.m.ngu...@dektech.com.au>
Sent: 09 January 2020 21:51
To: Minh Hon Chau <minh.c...@dektech.com.au>; Gary Lee <gary....@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net <opensaf-devel@lists.sourceforge.net>; 
Vu Minh Nguyen <vu.m.ngu...@dektech.com.au>
Subject: [PATCH 1/1] log: fix memory leak that was introduced in 3116 [#3138]

---
 src/log/logd/lgs_evt.cc         | 3 +++
 src/log/logd/lgs_mbcsv_cache.cc | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/log/logd/lgs_evt.cc b/src/log/logd/lgs_evt.cc
index 7501a282b..f169ea1e9 100644
--- a/src/log/logd/lgs_evt.cc
+++ b/src/log/logd/lgs_evt.cc
@@ -1348,6 +1348,7 @@ static uint32_t proc_write_log_async_msg(lgs_cb_t *cb, 
lgsv_lgs_evt_t *evt) {
            stream->fixedLogRecordSize, buf_size, logOutputString,
            ++stream->logRecordId, node_name)) == 0) {
     AckToWriteAsync(param, evt->fr_dest, SA_AIS_ERR_INVALID_PARAM);
+    free(logOutputString);
     return NCSCC_RC_SUCCESS;
   }

@@ -1356,6 +1357,8 @@ static uint32_t proc_write_log_async_msg(lgs_cb_t *cb, 
lgsv_lgs_evt_t *evt) {
                                                       evt->fr_dest, node_name);
   auto data = std::make_shared<Cache::Data>(info, logOutputString, n);
   Cache::instance()->Write(data);
+
+  lgs_free_write_log(param);
   return NCSCC_RC_SUCCESS;
 }

diff --git a/src/log/logd/lgs_mbcsv_cache.cc b/src/log/logd/lgs_mbcsv_cache.cc
index cde26432a..b190c5bea 100644
--- a/src/log/logd/lgs_mbcsv_cache.cc
+++ b/src/log/logd/lgs_mbcsv_cache.cc
@@ -230,6 +230,8 @@ uint32_t ckpt_proc_pop_write_async(lgs_cb_t* cb, void* 
data) {
   if (top->seq_id_ != seq_id) {
     LOG_ER("Out of sync! Expected seq: (%" PRIu64 "), Got: (%" PRIu64 ")",
            seq_id, top->seq_id_);
+    lgs_free_edu_mem(param->log_record);
+    lgs_free_edu_mem(param->log_file);
     return NCSCC_RC_FAILURE;
   }

--
2.17.1


_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel