kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 32582 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r32582 | tilghman | 2006-06-06 11:02:43 -0500 (Tue, 06 Jun 2006) | 2 lines

Bug 7268 - Callerid leaks memory on error

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-06-06 16:05:29 +00:00
parent 22b45aa4d3
commit 016034115e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
callerid.c
View File

@@ -557,6 +557,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
res = fsk_serie(&cid->fskd, buf, &mylen, &b); res = fsk_serie(&cid->fskd, buf, &mylen, &b);
if (mylen < 0) { if (mylen < 0) {
ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen); ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d)\n", mylen);
free(obuf);
return -1; return -1;
} }
buf += (olen - mylen); buf += (olen - mylen);
@@ -590,6 +591,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
case 4: /* Retrieve message */ case 4: /* Retrieve message */
if (cid->pos >= 128) { if (cid->pos >= 128) {
ast_log(LOG_WARNING, "Caller ID too long???\n"); ast_log(LOG_WARNING, "Caller ID too long???\n");
free(obuf);
return -1; return -1;
} }
cid->rawdata[cid->pos++] = b; cid->rawdata[cid->pos++] = b;
@@ -675,6 +677,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
strcpy(cid->name, ""); strcpy(cid->name, "");
cid->flags |= CID_UNKNOWN_NAME; cid->flags |= CID_UNKNOWN_NAME;
} }
free(obuf);
return 1; return 1;
break; break;
default: default: