[389-ds-base] branch master updated: Issue 50984 - Memory leaks in disk monitoring

This is an automated email from the git hooks/post-receive script.

spichugi pushed a commit to branch master
in repository 389-ds-base.

The following commit(s) were added to refs/heads/master by this push:
     new a171670  Issue 50984 - Memory leaks in disk monitoring
a171670 is described below

commit a171670d8706f201e18223d145f8685038cfbd6a
Author: Simon Pichugin 
AuthorDate: Fri Mar 27 11:35:55 2020 +0100

Issue 50984 - Memory leaks in disk monitoring

Description: Reset dirs pointer every time we free it.
    The code may be changed in the future so we should make it
    more robust.

https://pagure.io/389-ds-base/issue/50984

Reviewed by: spichugi, tbordaz (one line commit rule)
---
 ldap/servers/slapd/daemon.c | 2 ++
 ldap/servers/slapd/main.c   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index e7a5c28..65f2336 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -613,6 +613,7 @@ disk_monitoring_thread(void *nothing __attribute__((unused)))
                         }
                     }
                     slapi_ch_array_free(dirs);
+                    dirs = NULL;
                     return;
                 }
                 /*
@@ -712,6 +713,7 @@ disk_monitoring_thread(void *nothing __attribute__((unused)))
             }
         }
         slapi_ch_array_free(dirs);
+        dirs = NULL; /* now it is not needed but the code may be changed in the future and it'd better be more robust */
         g_set_shutdown(SLAPI_SHUTDOWN_DISKFULL);
         return;
 }
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 7d7c9ac..5eafb91 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -958,6 +958,7 @@ main(int argc, char **argv)
             goto cleanup;
         }
         slapi_ch_array_free(dirs);
+        dirs = NULL;
     }
     /* log the max fd limit as it is typically set in env/systemd */
     slapi_log_err(SLAPI_LOG_INFO, "main",