Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 7268 - Callerid leaks memory on error

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@32582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Tilghman Lesher 19 years ago
parent f0d3be1740
commit 43fa2d54ef
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
callerid.c
Unescape View File

@ -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); 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);
@ -307,6 +308,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;
@ -392,6 +394,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:

Write Preview
Loading…
Cancel
Save