[svn-commits] tilghman: branch 1.6.2 r268455 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Jun  5 12:28:23 2010
New Revision: 268455

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268455
Log:
Merged revisions 268454 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r268454 | tilghman | 2010-06-05 12:27:12 -0500 (Sat, 05 Jun 2010) | 5 lines
  
  Verify event is not NULL before attempting to lower its usecount.
  
  (closes issue #17234)
   Reported by: mav3rick
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=268455&r1=268454&r2=268455
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Sat Jun  5 12:28:23 2010
@@ -853,7 +853,9 @@
 		fclose(session->f);
 	ast_mutex_destroy(&session->__lock);
 	ast_free(session);
-	ast_atomic_fetchadd_int(&eqe->usecount, -1);
+	if (eqe) {
+		ast_atomic_fetchadd_int(&eqe->usecount, -1);
+	}
 }
 
 static void destroy_session(struct mansession_session *session)