From: Joshua Colp <jcolp@digium.com>
Date: Mon, 9 Jul 2007 15:34:54 +0000 (+0000)
Subject: Merged revisions 74082 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec8ef98a038373ace1dc900e6686ee1e87374efc;p=thirdparty%2Fasterisk.git

Merged revisions 74082 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r74082 | file | 2007-07-09 12:32:43 -0300 (Mon, 09 Jul 2007) | 2 lines

Only destroy the scheduler context if it was allocated. (issue #10124 reported by gzero)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 70226766fa..6c99bb3743 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -895,7 +895,7 @@ static char *skinny_cxmodes[] = {
 #endif
 
 /* driver scheduler */
-static struct sched_context *sched;
+static struct sched_context *sched = NULL;
 static struct io_context *io;
 
 /* Protect the monitoring thread, so only one process can kill or start it, and not
@@ -5147,7 +5147,8 @@ static int unload_module(void)
 	ast_cli_unregister_multiple(cli_skinny, sizeof(cli_skinny) / sizeof(struct ast_cli_entry));
 
 	close(skinnysock);
-	sched_context_destroy(sched);
+	if (sched)
+		sched_context_destroy(sched);
 
 	return 0;
 }