svn commit: samba r17087 - in branches/SAMBA_4_0/source/ntvfs/posix: .

metze at samba.org metze at samba.org
Mon Jul 17 11:15:11 GMT 2006


Author: metze
Date: 2006-07-17 11:15:10 +0000 (Mon, 17 Jul 2006)
New Revision: 17087

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17087

Log:
- make pvfs_notify_next_send static
- fix double free:
  a talloc_reference(a,b) when a is a child of b
  doesn't prevent talloc_free(b) from destroiying a and b.

metze
Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_notify.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_notify.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_notify.c	2006-07-17 11:04:47 UTC (rev 17086)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_notify.c	2006-07-17 11:15:10 UTC (rev 17087)
@@ -47,11 +47,10 @@
 /*
   send a notify on the next event run. 
 */
-void pvfs_notify_send_next(struct event_context *ev, struct timed_event *te, 
-			   struct timeval t, void *ptr)
+static void pvfs_notify_send_next(struct event_context *ev, struct timed_event *te, 
+				  struct timeval t, void *ptr)
 {
 	struct ntvfs_request *req = talloc_get_type(ptr, struct ntvfs_request);
-	talloc_free(req);
 	req->async_states->send_fn(req);
 }
 
@@ -109,7 +108,6 @@
 	/* we can't call pvfs_notify_send() directly here, as that
 	   would free the request, and the ntvfs modules above us
 	   could use it, so call it on the next event */
-	talloc_reference(notify_buffer, req);
 	event_add_timed(req->ctx->event_ctx, 
 			req, timeval_zero(), pvfs_notify_send_next, req);
 }



More information about the samba-cvs mailing list