summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-04-26 10:47:41 -0700
committerDavid Disseldorp <ddiss@samba.org>2013-04-27 20:44:55 +0200
commit251767cde9a146d8122d76e257ab232c05ad452a (patch)
tree7735278f108e6def14fae4dce0ddf32d10840a44
parentb7765fe63fa04e09ac67285d0e17e37b06bcff8b (diff)
downloadsamba-251767cde9a146d8122d76e257ab232c05ad452a.tar.gz
samba-251767cde9a146d8122d76e257ab232c05ad452a.tar.bz2
samba-251767cde9a146d8122d76e257ab232c05ad452a.zip
Fix bug #9822 - Samba crashing during Win8 sync.
When refactoring the dptr desctructor in the fix for bug: 9778 (Samba directory code uses dirfd() without vectoring through a VFS call) I removed the code to NULL out the struct smb_Dir * pointer inside the fsp struct by mistake. Re-add the NULLing out of that pointer when closing a directory pointer associated with an open file. Reporter confirms it fixes the crash. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org> Autobuild-User(master): David Disseldorp <ddiss@samba.org> Autobuild-Date(master): Sat Apr 27 20:44:55 CEST 2013 on sn-devel-104
-rw-r--r--source3/smbd/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 0c40a509c4..7dd959f943 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -685,6 +685,7 @@ void dptr_CloseDir(files_struct *fsp)
* all resource deallocation.
*/
dptr_close_internal(fsp->dptr);
+ fsp->dptr = NULL;
}
}