diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-02-11 15:11:47 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-02-11 15:11:47 +0000 |
commit | 4682d32d34dc1fa4af4ab0c2562f6eca62e273f3 (patch) | |
tree | 71487ac127c0397d0c57aac400b3830ebad1f383 /res/res_xmpp.c | |
parent | 27882b859976103e4e039b0107c0290604b17380 (diff) |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_xmpp.c')
-rw-r--r-- | res/res_xmpp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/res_xmpp.c b/res/res_xmpp.c index 3e84e4193..3ba849e56 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -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_delete(delete); - iks_delete(pubsub); iks_delete(request); } |