diff options
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ipc/ipc_rap.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/reference/ref_util.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/simple/svfs_util.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/simple/vfs_simple.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c index d2cd0b38d5..347ff39d97 100644 --- a/source4/ntvfs/ipc/ipc_rap.c +++ b/source4/ntvfs/ipc/ipc_rap.c @@ -178,7 +178,7 @@ static NTSTATUS rap_push_string(struct ndr_push *data_push, NDR_CHECK(ndr_push_uint16(data_push, heap->offset)); NDR_CHECK(ndr_push_uint16(data_push, 0)); - heap->strings = talloc_realloc(heap->mem_ctx, heap->strings, + heap->strings = talloc_realloc(heap->strings, sizeof(*heap->strings) * (heap->num_strings + 1)); diff --git a/source4/ntvfs/reference/ref_util.c b/source4/ntvfs/reference/ref_util.c index e221086950..8be80183c5 100644 --- a/source4/ntvfs/reference/ref_util.c +++ b/source4/ntvfs/reference/ref_util.c @@ -104,7 +104,7 @@ struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, cons if (dir->count >= allocated) { allocated = (allocated + 100) * 1.2; - dir->files = talloc_realloc(mem_ctx, dir->files, allocated * sizeof(dir->files[0])); + dir->files = talloc_realloc(dir->files, allocated * sizeof(dir->files[0])); if (!dir->files) { closedir(odir); return NULL; diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c index 7da9667e3c..1949ecb235 100644 --- a/source4/ntvfs/simple/svfs_util.c +++ b/source4/ntvfs/simple/svfs_util.c @@ -105,7 +105,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, if (dir->count >= allocated) { allocated = (allocated + 100) * 1.2; - dir->files = talloc_realloc(mem_ctx, dir->files, allocated * sizeof(dir->files[0])); + dir->files = talloc_realloc(dir->files, allocated * sizeof(dir->files[0])); if (!dir->files) { closedir(odir); return NULL; diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index ad889daf36..ae64c96c75 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -580,8 +580,8 @@ static NTSTATUS svfs_close(struct smbsrv_request *req, union smb_close *io) } DLIST_REMOVE(private->open_files, f); - talloc_free(req->tcon->mem_ctx, f->name); - talloc_free(req->tcon->mem_ctx, f); + talloc_free(f->name); + talloc_free(f); return NT_STATUS_OK; } @@ -766,7 +766,7 @@ static NTSTATUS svfs_search_first(struct smbsrv_request *req, union smb_search_f dir = svfs_list(mem_ctx, req, io->t2ffirst.in.pattern); if (!dir) { - talloc_destroy_pool(mem_ctx); + talloc_free(mem_ctx); return NT_STATUS_FOOBAR; } |