diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-08-21 21:01:11 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-08-21 21:01:11 +0000 |
| commit | 6a539ace84035883c6f95eee21f5072a9f8fe812 (patch) | |
| tree | d57065626b02f4ab9e372036d5a76621c07e3347 /res/res_jabber.c | |
| parent | 89a5ff859d4e6a66c813f5b240d8c9f6ddb119a3 (diff) | |
Fix misuses of asprintf throughout the code.
This fixes three main issues
* Change asprintf() uses to ast_asprintf() so that it
pairs properly with ast_free() and no longer causes
MALLOC_DEBUG to freak out.
* When ast_asprintf() fails, set the pointer NULL if
it will be referenced later.
* Fix some memory leaks that were spotted while taking
care of the first two points.
(Closes issue ASTERISK-20135)
reported by Richard Mudgett
Review: https://reviewboard.asterisk.org/r/2071
........
Merged revisions 371590 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 371591 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 371592 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 9cab2f159..ee55df99a 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -1760,11 +1760,9 @@ static int aji_act_hook(void *data, int type, iks *node) sprintf(secret, "%s%s", pak->id, client->password); ast_sha1_hash(shasum, secret); - handshake = NULL; - if (asprintf(&handshake, "<handshake>%s</handshake>", shasum) >= 0) { + if (ast_asprintf(&handshake, "<handshake>%s</handshake>", shasum) >= 0) { aji_send_raw(client, handshake); ast_free(handshake); - handshake = NULL; } client->state = AJI_CONNECTING; if (aji_recv(client, 1) == 2) /*XXX proper result for iksemel library on iks_recv of <handshake/> XXX*/ @@ -4479,8 +4477,7 @@ static int aji_create_client(char *label, struct ast_variable *var, int debug) return 0; } if (!strchr(client->user, '/') && !client->component) { /*client */ - resource = NULL; - if (asprintf(&resource, "%s/asterisk", client->user) >= 0) { + if (ast_asprintf(&resource, "%s/asterisk", client->user) >= 0) { client->jid = iks_id_new(client->stack, resource); ast_free(resource); } |