sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s3-registry: fix REG_MULTI_SZ handling in registry_push_value.

Browse Source 
Catched by smbconftort test on the buildfarm.

Guenther
This commit is contained in:
Günther Deschner 2009-11-25 21:34:55 +01:00
parent c438b2b392
commit 95108f1c60
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/lib/util_reg_api.c
View File

@ -161,12 +161,29 @@ WERROR registry_push_value(TALLOC_CTX *mem_ctx,
}
break;
}
case REG_MULTI_SZ:
if (!push_reg_multi_sz(mem_ctx, presult, (const char **)value->v.multi_sz.strings))
{
case REG_MULTI_SZ: {
/* handle the case where we don't get a NULL terminated array */
const char **array;
int i;
array = talloc_array(mem_ctx, const char *,
value->v.multi_sz.num_strings + 1);
if (!array) {
return WERR_NOMEM;
}
for (i=0; i < value->v.multi_sz.num_strings; i++) {
array[i] = value->v.multi_sz.strings[i];
}
array[i] = NULL;
if (!push_reg_multi_sz(mem_ctx, presult, array)) {
talloc_free(array);
return WERR_NOMEM;
}
talloc_free(array);
break;
}
case REG_BINARY:
*presult = data_blob_talloc(mem_ctx,
value->v.binary.data,