[PATCH] lib: Use talloc_zero_array instead of memset

Volker Lendecke Volker.Lendecke at SerNet.DE
Fri Dec 26 12:47:47 MST 2014


Hi!

Review&push appreciated!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 76338fa73218830333fbb8387ed5ba271361086e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 26 Dec 2014 19:41:23 +0000
Subject: [PATCH] lib: Use talloc_zero_array instead of memset

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/util/util_file.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 83c746b..b9d7bdd 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -282,7 +282,7 @@ char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx
 		if (s[0] == '\n') i++;
 	}
 
-	ret = talloc_array(mem_ctx, char *, i+2);
+	ret = talloc_zero_array(mem_ctx, char *, i+2);
 	if (!ret) {
 		talloc_free(p);
 		return NULL;
@@ -290,8 +290,6 @@ char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx
 
 	talloc_steal(ret, p);
 
-	memset(ret, 0, sizeof(ret[0])*(i+2));
-
 	ret[0] = p;
 	for (s = p, i=0; s < p+size; s++) {
 		if (s[0] == '\n') {
-- 
1.9.1



More information about the samba-technical mailing list