Null terminate things propelry

3 files changed, 10 insertions, 1 deletions

diff --git a/plugin/autoserial.c b/plugin/autoserial.c
index 16af5d7..7380cef 100644
--- a/plugin/autoserial.c
+++ b/plugin/autoserial.c
@@ -100,6 +100,9 @@ search_for_dns (const char *base, const char *filter, char ***results)
 		*(d++) = dn;
 	}
 
+	/* Null terminate */
+	*d = NULL;
+
 	slapi_pblock_destroy (pb);
 	*results = dns;
 
diff --git a/plugin/dnsnotify.c b/plugin/dnsnotify.c
index fd9d722..a81feb1 100644
--- a/plugin/dnsnotify.c
+++ b/plugin/dnsnotify.c
@@ -97,13 +97,16 @@ load_soa_ns_attributes (const char *dn, char **soa_result, char ***ns_result)
 			for (v = values; *v; ++v)
 				++num;
 
-			ns = (char**)slapi_ch_calloc (num, sizeof (char*));
+			ns = (char**)slapi_ch_calloc (num + 1, sizeof (char*));
 			for (i = 0; i < num; ++i) {
 				ns[i] = slapi_ch_malloc (values[i]->bv_len + 1);
 				if (values[i]->bv_len)
 					memcpy (ns[i], values[i]->bv_val, values[i]->bv_len);
 				ns[i][values[i]->bv_len] = 0;
 			}
+
+			/* Null terminate */
+			ns[i] = NULL;
 		}
 	}
 
diff --git a/plugin/plugin.c b/plugin/plugin.c
index 54144ba..150e605 100644
--- a/plugin/plugin.c
+++ b/plugin/plugin.c
@@ -332,6 +332,9 @@ plugin_init (Slapi_PBlock *pb)
 			log_plugin ("unrecognized plugin argument: %s", argv[i]);
 	}
 
+	/* Null terminate */
+	plugin_arguments[i] = NULL;
+
 	/* Next we initialize all components */
 	if (autoserial_init () < 0 ||
 	    dnsnotify_init() < 0)