[svn-commits] mjordan: trunk r381160 - in /trunk: ./ res/res_xmpp.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Mon Feb 11 09:11:47 2013
New Revision: 381160

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381160
Log:
Fix crash in res_xmpp when deleting pubsub node from CLI

An error existed in res_xmpp where it would attempt to delete attributes from
a node that itself was also deleted. Per the iksemel documentation, attributes
added using iks_insert are copied to the parent node's stack, and will be
reclaimed when that node is itself destroyed.

(closes issue ASTERISK-20982)
Reported by: marcelloceschia
patches:
  delete-node-fix.diff uploaded by marcelloceschia (License 6036)
........

Merged revisions 381159 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/res_xmpp.c

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

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=381160&r1=381159&r2=381160
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Mon Feb 11 09:11:47 2013
@@ -1093,8 +1093,6 @@
 	iks_insert_attrib(delete, "node", node_name);
 	ast_xmpp_client_send(client, request);
 
-	iks_delete(delete);
-	iks_delete(pubsub);
 	iks_delete(request);
 }