[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5168-g5730172

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  57301725e1c92676d3dbb62c81a41507ed1adb7b (commit)
      from  efa7f6bff9bec89214dab368ff5efc61fa1cc212 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 57301725e1c92676d3dbb62c81a41507ed1adb7b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 26 10:13:50 2009 +0100

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

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

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


Changeset truncated at 500 lines:

diff --git a/source/lib/avahi.c b/source/lib/avahi.c
index bdc58cb..b30ef06 100644
--- a/source/lib/avahi.c
+++ b/source/lib/avahi.c
@@ -216,6 +216,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 = event_add_timed(t->ctx->ev, t, *tv, avahi_timeout_handler, t);
 	/*
 	 * No failure mode defined here


-- 
Samba Shared Repository