[asterisk-commits] mmichelson: trunk r370726 - /trunk/main/manager.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Aug 1 14:37:05 CDT 2012


Author: mmichelson
Date: Wed Aug  1 14:37:03 2012
New Revision: 370726

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370726
Log:
Fix a possible crash due to passing NULL to ast_variables_dup()


Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=370726&r1=370725&r2=370726
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Aug  1 14:37:03 2012
@@ -2556,7 +2556,9 @@
 	s->session->readperm = user->readperm;
 	s->session->writeperm = user->writeperm;
 	s->session->writetimeout = user->writetimeout;
-	s->session->chanvars = ast_variables_dup(user->chanvars);
+	if (user->chanvars) {
+		s->session->chanvars = ast_variables_dup(user->chanvars);
+	}
 
 	filter_iter = ao2_iterator_init(user->whitefilters, 0);
 	while ((regex_filter = ao2_iterator_next(&filter_iter))) {




More information about the asterisk-commits mailing list