Fix crash in res_xmpp when deleting pubsub node from CLI
authorMatthew Jordan <mjordan@digium.com>
Mon, 11 Feb 2013 15:11:47 +0000 (15:11 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 11 Feb 2013 15:11:47 +0000 (15:11 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381160 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_xmpp.c

index 3e84e41..3ba849e 100644 (file)
@@ -1093,8 +1093,6 @@ static void xmpp_pubsub_delete_node(struct ast_xmpp_client *client, const char *
        iks_insert_attrib(delete, "node", node_name);
        ast_xmpp_client_send(client, request);
 
        iks_insert_attrib(delete, "node", node_name);
        ast_xmpp_client_send(client, request);
 
-       iks_delete(delete);
-       iks_delete(pubsub);
        iks_delete(request);
 }
 
        iks_delete(request);
 }