[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-726-ga20a710

[Volker Lendecke]

The branch, master has been updated
       via  a20a710c944055932402ec5dfe3a36ac3d654cbf (commit)
      from  202228d48b6459148d328840d23322ecfac00626 (commit)

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


- Log -----------------------------------------------------------------
commit a20a710c944055932402ec5dfe3a36ac3d654cbf
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 26 10:03:59 2009 +0100

    Avahi disables a timer by tv=NULL in avahi_timeout_update(), do not crash

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

Summary of changes:
 source3/lib/avahi.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/avahi.c b/source3/lib/avahi.c
index ac9867a..269b329 100644
--- a/source3/lib/avahi.c
+++ b/source3/lib/avahi.c
@@ -207,6 +207,13 @@ static void avahi_timeout_update(AvahiTimeout *t, const struct timeval *tv)
 {
 	TALLOC_FREE(t->te);
 
+	if (tv == NULL) {
+		/*
+		 * Disable this timer
+		 */
+		return;
+	}
+
 	t->te = tevent_add_timer(t->ctx->ev, t, *tv, avahi_timeout_handler, t);
 	/*
 	 * No failure mode defined here


-- 
Samba Shared Repository