[svn-commits] qwell: trunk r88079 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Nov  1 11:22:09 2007
New Revision: 88079

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88079
Log:
Merged revisions 88078 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88078 | qwell | 2007-11-01 11:21:22 -0500 (Thu, 01 Nov 2007) | 4 lines

Make sure we set the poll fds to NULL after free()ing it.

Part of issue 11017, patch by tzafrir.

........

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

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=88079&r1=88078&r2=88079
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Nov  1 11:22:09 2007
@@ -7163,8 +7163,10 @@
 		/* Lock the interface list */
 		ast_mutex_lock(&iflock);
 		if (!pfds || (lastalloc != ifcount)) {
-			if (pfds)
+			if (pfds) {
 				ast_free(pfds);
+				pfds = NULL;
+			}
 			if (ifcount) {
 				if (!(pfds = ast_calloc(1, ifcount * sizeof(*pfds)))) {
 					ast_mutex_unlock(&iflock);