From fef41956b9308482a2496827851d47f54dc4873b Mon Sep 17 00:00:00 2001 From: Gregor Beck Date: Fri, 29 Jun 2012 11:36:54 +0200 Subject: s3:cclean: fix memory allocation Signed-off-by: Michael Adam --- source3/utils/cclean.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/cclean.c b/source3/utils/cclean.c index b035d33c03..d98725e7fb 100644 --- a/source3/utils/cclean.c +++ b/source3/utils/cclean.c @@ -66,7 +66,7 @@ static int read_connections_fn(const struct connections_key *key, struct cclean_ctx *ctx = (struct cclean_ctx *)cclean_ctx; unsigned length = talloc_array_length(ctx->cnums); if (length <= ctx->num) { - int n = 2*length; + int n = MAX(2*length, 16); void *tmp; tmp = talloc_realloc(ctx, ctx->ids, struct server_id, n); @@ -95,7 +95,7 @@ static int read_connections_fn(const struct connections_key *key, ctx->ids[ctx->num] = key->pid; ctx->cnums[ctx->num] = key->cnum; ctx->names[ctx->num] = talloc_strndup(ctx, key->name, FSTRING_LEN); - if (ctx->names[ctx->num]) { + if (ctx->names[ctx->num] == NULL) { goto talloc_failed; } ctx->num++; -- cgit