diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-06 16:02:43 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-06 16:02:43 +0000 |
commit | ba9bad966635e2c73b42fba4fa08c0f2925f66f9 (patch) | |
tree | dba6becfe55bc1a1b4ee15af7fa3b7b50e751246 /callerid.c | |
parent | acffe12698768a9bfe26d092672cc40dd04a6fbe (diff) |
Bug 7268 - Callerid leaks memory on error
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@32582 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'callerid.c')
-rw-r--r-- | callerid.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/callerid.c b/callerid.c index a0937b24a..f709bd501 100644 --- a/callerid.c +++ b/callerid.c @@ -274,6 +274,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int res = fsk_serie(&cid->fskd, buf, &mylen, &b); if (mylen < 0) { ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen); + free(obuf); return -1; } buf += (olen - mylen); @@ -307,6 +308,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int case 4: /* Retrieve message */ if (cid->pos >= 128) { ast_log(LOG_WARNING, "Caller ID too long???\n"); + free(obuf); return -1; } cid->rawdata[cid->pos++] = b; @@ -392,6 +394,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int strcpy(cid->name, ""); cid->flags |= CID_UNKNOWN_NAME; } + free(obuf); return 1; break; default: |