[SCM] Samba Shared Repository - branch master updated - 07e01f8405f2bd3f0ee521e8aebf2c647052104f

[Stefan Metzmacher]

The branch, master has been updated
       via  07e01f8405f2bd3f0ee521e8aebf2c647052104f (commit)
       via  4e7f0a88513363b03878df094ed8ccc9b159f165 (commit)
      from  d1f7a3717406de855169e88ebc5a9da2318c99ef (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 07e01f8405f2bd3f0ee521e8aebf2c647052104f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 7 06:32:25 2009 +0100

    s4:smbclient: correct initialize smbclient_context
    
    Found by valgrind.
    
    metze

commit 4e7f0a88513363b03878df094ed8ccc9b159f165
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 7 06:30:37 2009 +0100

    tevent: don't try to dereference fde->event_ctx when the event context doesn't exists anymore
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/tevent/tevent.c     |    3 +++
 source4/client/client.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 2e5abbf..c8b79c6 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -279,6 +279,7 @@ void tevent_fd_set_close_fn(struct tevent_fd *fde,
 			    tevent_fd_close_fn_t close_fn)
 {
 	if (!fde) return;
+	if (!fde->event_ctx) return;
 	fde->event_ctx->ops->set_fd_close_fn(fde, close_fn);
 }
 
@@ -301,6 +302,7 @@ void tevent_fd_set_auto_close(struct tevent_fd *fde)
 uint16_t tevent_fd_get_flags(struct tevent_fd *fde)
 {
 	if (!fde) return 0;
+	if (!fde->event_ctx) return 0;
 	return fde->event_ctx->ops->get_fd_flags(fde);
 }
 
@@ -310,6 +312,7 @@ uint16_t tevent_fd_get_flags(struct tevent_fd *fde)
 void tevent_fd_set_flags(struct tevent_fd *fde, uint16_t flags)
 {
 	if (!fde) return;
+	if (!fde->event_ctx) return;
 	fde->event_ctx->ops->set_fd_flags(fde, flags);
 }
 
diff --git a/source4/client/client.c b/source4/client/client.c
index 13b7053..018be29 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3190,7 +3190,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
 		exit(1);
 	}
 
-	ctx = talloc(mem_ctx, struct smbclient_context);
+	ctx = talloc_zero(mem_ctx, struct smbclient_context);
 	ctx->io_bufsize = 64512;
 
 	pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 0);


-- 
Samba Shared Repository