X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=libgpo%2Fgpo_ini.c;h=7df56a81b0079dce1951f1605299f862552aedc2;hp=af2b88c0b8a311f702d6ed7403641b3ea9ecc65b;hb=f768b32e37788e6722217148b0a73e54c04bc03a;hpb=171a361375e1cd76a80253d67e4e34a139bb5570

diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index af2b88c0b8a..7df56a81b00 100644
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -42,6 +42,7 @@ static bool store_keyval_pair(const char *key, const char *value, void *ctx_ptr)
 {
 	struct gp_inifile_context *ctx = (struct gp_inifile_context *) ctx_ptr;
 	ctx->data = talloc_realloc(ctx, ctx->data, struct keyval_pair *, ctx->keyval_count+1);
+	ctx->data[ctx->keyval_count] = talloc_zero(ctx, struct keyval_pair);
 	ctx->data[ctx->keyval_count]->key = talloc_asprintf(ctx, "%s:%s", ctx->current_section, key);
 	ctx->data[ctx->keyval_count]->val = talloc_strdup(ctx, value);
 	ctx->keyval_count++;
@@ -87,7 +88,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
 	}
 
 	if (!convert_string_talloc(mem_ctx, CH_UTF16LE, CH_UNIX, data_in, n,
-				   (void **)&data_out, &converted_size, false))
+				   (void *)&data_out, &converted_size, false))
 	{
 		status = NT_STATUS_INVALID_BUFFER_SIZE;
 		goto out;