kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the missing call to free described in issue #8268. Also, add a bunch of

Browse Source 
missing calls to free in callerid_feed_jp().


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-11-02 14:02:37 +00:00
parent e626d78269
commit 105fa492b4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/callerid.c
View File

@@ -300,12 +300,13 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
buf[x+cid->oldlen/2] = AST_XLAW(ubuf[x]); buf[x+cid->oldlen/2] = AST_XLAW(ubuf[x]);
while (mylen >= 160) { while (mylen >= 160) {
b = b2 = 0 ; b = b2 = 0;
olen = mylen; olen = mylen;
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;
} }
@@ -313,6 +314,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
if (res < 0) { if (res < 0) {
ast_log(LOG_NOTICE, "fsk_serie failed\n"); ast_log(LOG_NOTICE, "fsk_serie failed\n");
free(obuf);
return -1; return -1;
} }
@@ -384,6 +386,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
cid->len = b; cid->len = b;
if ( (cid->len+2) >= sizeof( cid->rawdata ) ) { if ( (cid->len+2) >= sizeof( cid->rawdata ) ) {
ast_log(LOG_WARNING, "too long caller id string\n" ) ; ast_log(LOG_WARNING, "too long caller id string\n" ) ;
free(obuf);
return -1; return -1;
} }
cid->rawdata[cid->pos++] = b; cid->rawdata[cid->pos++] = b;
@@ -406,6 +409,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
cid->sawflag = 12; cid->sawflag = 12;
if ( cid->crc != 0 ) { if ( cid->crc != 0 ) {
ast_log(LOG_WARNING, "crc checksum error\n" ) ; ast_log(LOG_WARNING, "crc checksum error\n" ) ;
free(obuf);
return -1; return -1;
} }
/* extract caller id data */ /* extract caller id data */
@@ -515,6 +519,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
break ; break ;
} }
} }
free(obuf);
return 1; return 1;
break; break;
default: default:
@@ -563,6 +568,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
buf += (olen - mylen); buf += (olen - mylen);
if (res < 0) { if (res < 0) {
ast_log(LOG_NOTICE, "fsk_serie failed\n"); ast_log(LOG_NOTICE, "fsk_serie failed\n");
free(obuf);
return -1; return -1;
} }
if (res == 1) { if (res == 1) {