kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the buffer used in callerid_feed() and callerid_feed_jp() to be

Browse Source 
allocated on the stack using alloca() instead of using malloc() since
they are only used locally to these functions.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46885 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-11-02 14:07:48 +00:00
parent f02509cef4
commit c227df91d9
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/callerid.c
View File

@@ -286,13 +286,9 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
int res;
int x;
short *buf;
short *obuf;
if (!(buf = ast_calloc(1, 2 * len + cid->oldlen))) {
return -1;
}
buf = alloca(2 * len + cid->oldlen);
obuf = buf;
memcpy(buf, cid->oldstuff, cid->oldlen);
mylen += cid->oldlen/2;
@@ -300,7 +296,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
buf[x+cid->oldlen/2] = AST_XLAW(ubuf[x]);
while (mylen >= 160) {
b = b2 = 0 ;
b = b2 = 0;
olen = mylen;
res = fsk_serie(&cid->fskd, buf, &mylen, &b);
@@ -527,7 +523,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, i
cid->oldlen = mylen * 2;
} else
cid->oldlen = 0;
free(obuf);
return 0;
}
@@ -540,24 +536,19 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
int res;
int x;
short *buf;
short *obuf;
if (!(buf = ast_calloc(1, 2 * len + cid->oldlen))) {
return -1;
}
buf = alloca(2 * len + cid->oldlen);
obuf = buf;
memcpy(buf, cid->oldstuff, cid->oldlen);
mylen += cid->oldlen/2;
for (x=0;x<len;x++)
buf[x+cid->oldlen/2] = AST_XLAW(ubuf[x]);
while(mylen >= 160) {
while (mylen >= 160) {
olen = mylen;
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);
@@ -591,7 +582,6 @@ 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;
@@ -677,7 +667,6 @@ 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:
@@ -690,7 +679,6 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
cid->oldlen = mylen * 2;
} else
cid->oldlen = 0;
free(obuf);
return 0;
}