diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-06-15 08:34:12 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-06-17 22:10:24 +0200 |
| commit | bcb69499e1a9312ea3ee32561fdecb2b22835e77 (patch) | |
| tree | db2c3bb94b5d56f7a3bc04f7010da773077b90b4 /source3/smbd | |
| parent | 8406d4dd1593b4a4d7bcbdc7b7c7893339f8e814 (diff) | |
| download | samba-bcb69499e1a9312ea3ee32561fdecb2b22835e77.tar.gz | |
s3:smb2_setinfo: fix memory leak in the defer_rename case
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11329
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/smb2_setinfo.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 3f7bbec94b5..9361aeaf917 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -168,6 +168,12 @@ struct defer_rename_state { int data_size; }; +static int defer_rename_state_destructor(struct defer_rename_state *rename_state) +{ + SAFE_FREE(rename_state->data); + return 0; +} + static void defer_rename_done(struct tevent_req *subreq); static struct tevent_req *delay_rename_for_lease_break(struct tevent_req *req, @@ -240,6 +246,8 @@ static struct tevent_req *delay_rename_for_lease_break(struct tevent_req *req, rename_state->data = data; rename_state->data_size = data_size; + talloc_set_destructor(rename_state, defer_rename_state_destructor); + subreq = dbwrap_record_watch_send( rename_state, ev, @@ -312,6 +320,7 @@ static void defer_rename_done(struct tevent_req *subreq) state->data_size); if (subreq) { /* Yep - keep waiting. */ + state->data = NULL; TALLOC_FREE(state); TALLOC_FREE(lck); return; |