summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/oplock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index eec19259d0..aaa236effa 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -348,6 +348,12 @@ static void oplock_timeout_handler(struct timed_event *te,
{
files_struct *fsp = (files_struct *)private_data;
+ /* Ensure we always remove this event. */
+ if (fsp->oplock_timeout != NULL) {
+ /* Remove the timed event handler. */
+ TALLOC_FREE(fsp->oplock_timeout);
+ fsp->oplock_timeout = NULL;
+ }
DEBUG(0, ("Oplock break failed for file %s -- replying anyway\n", fsp->fsp_name));
global_client_failed_oplock_break = True;
remove_oplock(fsp);