diff options
| author | Jeremy Allison <jra@samba.org> | 2009-01-02 12:51:18 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-01-02 12:51:18 -0800 |
| commit | e000045f15665f1c5209f52bf5730bac5c14256b (patch) | |
| tree | bb72078d66fae6c8b854129ba0abd92afd279757 /source4/lib/registry/regf.c | |
| parent | 3d2d0203e57bacf0cd61cfb72780a4bd9aa42707 (diff) | |
| parent | 793f1cdbd918f2245255176572027763664d9d0b (diff) | |
| download | samba-e000045f15665f1c5209f52bf5730bac5c14256b.tar.gz samba-e000045f15665f1c5209f52bf5730bac5c14256b.tar.bz2 samba-e000045f15665f1c5209f52bf5730bac5c14256b.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/lib/registry/regf.c')
| -rw-r--r-- | source4/lib/registry/regf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c index a869ed4440..4cbcb09a10 100644 --- a/source4/lib/registry/regf.c +++ b/source4/lib/registry/regf.c @@ -543,7 +543,7 @@ static WERROR regf_get_value(TALLOC_CTX *ctx, struct hive_key *key, if (vk->data_length & 0x80000000) { vk->data_length &=~0x80000000; - data->data = (uint8_t *)&vk->data_offset; + data->data = talloc_memdup(ctx, (uint8_t *)&vk->data_offset, vk->data_length); data->length = vk->data_length; } else { *data = hbin_get(regf, vk->data_offset); @@ -2045,7 +2045,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location, struct tdr_pull *pull; int i; - regf = (struct regf_data *)talloc_zero(NULL, struct regf_data); + regf = (struct regf_data *)talloc_zero(parent_ctx, struct regf_data); regf->iconv_convenience = iconv_convenience; |