[svn-commits] file: trunk r74083 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jul  9 10:34:54 2007
New Revision: 74083

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74083
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=74083&r1=74082&r2=74083
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Mon Jul  9 10:34:54 2007
@@ -895,7 +895,7 @@
 #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 @@
 	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;
 }