sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

smbd: Use talloc_pooled_object in cp_smb_filename

Browse Source 
Requires new talloc

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2013-09-06 15:34:44 -07:00
parent 256d10f579
commit 7f9bdabda5
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source3/lib/filename_util.c
View File

@ -161,39 +161,55 @@ struct smb_filename *cp_smb_filename(TALLOC_CTX *mem_ctx,
const struct smb_filename *in)
{
struct smb_filename *out;
size_t base_len = 0;
size_t stream_len = 0;
size_t lcomp_len = 0;
int num = 0;
/* stream_name must always be NULL if there is no stream. */
if (in->stream_name) {
SMB_ASSERT(in->stream_name[0] != '\0');
}
out = talloc_zero(mem_ctx, struct smb_filename);
if (in->base_name != NULL) {
base_len = strlen(in->base_name) + 1;
num += 1;
}
if (in->stream_name != NULL) {
stream_len = strlen(in->stream_name) + 1;
num += 1;
}
if (in->original_lcomp != NULL) {
lcomp_len = strlen(in->original_lcomp) + 1;
num += 1;
}
out = talloc_pooled_object(mem_ctx, struct smb_filename,
num, stream_len + base_len + lcomp_len);
if (out == NULL) {
return NULL;
}
ZERO_STRUCTP(out);
/*
* The following allocations cannot fails as we
* pre-allocated space for them in the out pooled
* object.
*/
if (in->base_name != NULL) {
out->base_name = talloc_strdup(out, in->base_name);
if (out->base_name == NULL) {
goto fail;
}
out->base_name = talloc_memdup(
out, in->base_name, base_len);
}
if (in->stream_name != NULL) {
out->stream_name = talloc_strdup(out, in->stream_name);
if (out->stream_name == NULL) {
goto fail;
}
out->stream_name = talloc_memdup(
out, in->stream_name, stream_len);
}
if (in->original_lcomp != NULL) {
out->original_lcomp = talloc_strdup(out, in->original_lcomp);
if (out->original_lcomp == NULL) {
goto fail;
}
out->original_lcomp = talloc_memdup(
out, in->original_lcomp, lcomp_len);
}
out->st = in->st;
return out;
fail:
TALLOC_FREE(out);
return NULL;
}
/****************************************************************************