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

More memory wrapper and cleanup work. #6226 w/one very minor compile fix mod in app_rpt.c

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
BJ Weschke 20 years ago
parent 8d4ee3882a
commit 8637b23569
3 changed files with 54 additions and 92 deletions
Show Stats Download Patch File Download Diff File

30
apps/app_queue.c
Unescape View File

@ -515,8 +515,7 @@ static int statechange_queue(const char *dev, int state, void *ign)
pthread_t t; pthread_t t;
pthread_attr_t attr; pthread_attr_t attr;
sc = ast_calloc(1, sizeof(*sc) + strlen(dev) + 1); if ((sc = ast_calloc(1, sizeof(*sc) + strlen(dev) + 1))) {
if (sc) {
sc->state = state; sc->state = state;
strcpy(sc->dev, dev); strcpy(sc->dev, dev);
pthread_attr_init(&attr); pthread_attr_init(&attr);
@ -535,9 +534,7 @@ static struct member *create_queue_member(char *interface, int penalty, int paus
/* Add a new member */ /* Add a new member */
cur = ast_calloc(1, sizeof(*cur)); if ((cur = ast_calloc(1, sizeof(*cur)))) {
if (cur) {
cur->penalty = penalty; cur->penalty = penalty;
cur->paused = paused; cur->paused = paused;
ast_copy_string(cur->interface, interface, sizeof(cur->interface)); ast_copy_string(cur->interface, interface, sizeof(cur->interface));
@ -553,8 +550,7 @@ static struct ast_call_queue *alloc_queue(const char *queuename)
{ {
struct ast_call_queue *q; struct ast_call_queue *q;
q = ast_calloc(1, sizeof(*q)); if ((q = ast_calloc(1, sizeof(*q)))) {
if (q) {
ast_mutex_init(&q->lock); ast_mutex_init(&q->lock);
ast_copy_string(q->name, queuename, sizeof(q->name)); ast_copy_string(q->name, queuename, sizeof(q->name));
} }
@ -827,8 +823,7 @@ static struct ast_call_queue *find_queue_by_name_rt(const char *queuename, struc
/* Create a new queue if an in-core entry does not exist yet. */ /* Create a new queue if an in-core entry does not exist yet. */
if (!q) { if (!q) {
q = alloc_queue(queuename); if (!(q = alloc_queue(queuename)))
if (!q)
return NULL; return NULL;
ast_mutex_lock(&q->lock); ast_mutex_lock(&q->lock);
clear_queue(q); clear_queue(q);
@ -1704,11 +1699,8 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser
if (in->cid.cid_ani) { if (in->cid.cid_ani) {
if (o->chan->cid.cid_ani) if (o->chan->cid.cid_ani)
free(o->chan->cid.cid_ani); free(o->chan->cid.cid_ani);
o->chan->cid.cid_ani = ast_calloc(1, strlen(in->cid.cid_ani) + 1); if ((o->chan->cid.cid_ani = ast_calloc(1, strlen(in->cid.cid_ani) + 1)))
if (o->chan->cid.cid_ani)
strncpy(o->chan->cid.cid_ani, in->cid.cid_ani, strlen(in->cid.cid_ani) + 1); strncpy(o->chan->cid.cid_ani, in->cid.cid_ani, strlen(in->cid.cid_ani) + 1);
else
ast_log(LOG_WARNING, "Out of memory\n");
} }
if (o->chan->cid.cid_rdnis) if (o->chan->cid.cid_rdnis)
free(o->chan->cid.cid_rdnis); free(o->chan->cid.cid_rdnis);
@ -2060,12 +2052,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
announce = announceoverride; announce = announceoverride;
while(cur) { while(cur) {
tmp = ast_calloc(1, sizeof(*tmp)); if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
if (!tmp) {
ast_mutex_unlock(&qe->parent->lock); ast_mutex_unlock(&qe->parent->lock);
if (use_weight) if (use_weight)
ast_mutex_unlock(&qlock); ast_mutex_unlock(&qlock);
ast_log(LOG_WARNING, "Out of memory\n");
goto out; goto out;
} }
tmp->stillgoing = -1; tmp->stillgoing = -1;
@ -3204,7 +3194,9 @@ static void reload_queues(void)
} }
if (!q) { if (!q) {
/* Make one then */ /* Make one then */
q = alloc_queue(cat); if (!(q = alloc_queue(cat))) {
/* TODO: Handle memory allocation failure */
}
new = 1; new = 1;
} else } else
new = 0; new = 0;
@ -3681,8 +3673,8 @@ static char *complete_add_queue_member(char *line, char *word, int pos, int stat
} }
case 7: case 7:
if (state < 100) { /* 0-99 */ if (state < 100) { /* 0-99 */
char *num = ast_malloc(3); char *num;
if (num) { if ((num = ast_malloc(3))) {
sprintf(num, "%d", state); sprintf(num, "%d", state);
} }
return num; return num;

50
apps/app_rpt.c
Unescape View File

@ -1041,8 +1041,7 @@ struct tm localtm;
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!mychannel)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_mutex_lock(&myrpt->lock); ast_mutex_lock(&myrpt->lock);
@ -1313,10 +1312,8 @@ struct tm localtm;
l = l->next; l = l->next;
continue; continue;
} }
m = ast_malloc(sizeof(*m)); if (!(m = ast_malloc(sizeof(*m))))
if (!m)
{ {
ast_log(LOG_WARNING, "Cannot alloc memory on %s\n", mychannel->name);
ast_mutex_lock(&myrpt->lock); ast_mutex_lock(&myrpt->lock);
remque((struct qelem *)mytele); remque((struct qelem *)mytele);
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
@ -1564,15 +1561,11 @@ struct rpt_tele *tele;
struct rpt_link *mylink = (struct rpt_link *) data; struct rpt_link *mylink = (struct rpt_link *) data;
pthread_attr_t attr; pthread_attr_t attr;
tele = ast_malloc(sizeof(*tele)); if (!(tele = ast_calloc(1, sizeof(*tele))))
if (!tele)
{ {
ast_log(LOG_WARNING, "Unable to allocate memory\n");
pthread_exit(NULL); pthread_exit(NULL);
return; return;
} }
/* zero it out */
memset((char *)tele,0,sizeof(struct rpt_tele));
tele->rpt = myrpt; tele->rpt = myrpt;
tele->mode = mode; tele->mode = mode;
ast_mutex_lock(&myrpt->lock); ast_mutex_lock(&myrpt->lock);
@ -1605,8 +1598,7 @@ struct ast_channel *mychannel,*genchannel;
myrpt->mydtmf = 0; myrpt->mydtmf = 0;
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!mychannel)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
pthread_exit(NULL); pthread_exit(NULL);
@ -1624,8 +1616,7 @@ struct ast_channel *mychannel,*genchannel;
pthread_exit(NULL); pthread_exit(NULL);
} }
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
genchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(genchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!genchannel)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_hangup(mychannel); ast_hangup(mychannel);
@ -1952,9 +1943,7 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1); strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
/* establish call in monitor mode */ /* establish call in monitor mode */
l = ast_calloc(1, sizeof(*l)); if (!(l = ast_calloc(1, sizeof(*l)))) {
if (!l){
ast_log(LOG_WARNING, "Unable to malloc\n");
return DC_ERROR; return DC_ERROR;
} }
/* zero the silly thing */ /* zero the silly thing */
@ -1993,8 +1982,7 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
return DC_ERROR; return DC_ERROR;
} }
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL))) {
if (!l->pchan){
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_hangup(l->chan); ast_hangup(l->chan);
free(l); free(l);
@ -2065,9 +2053,7 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1); strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
/* establish call in tranceive mode */ /* establish call in tranceive mode */
l = ast_calloc(1, sizeof(*l)); if (!(l = ast_calloc(1, sizeof(*l)))) {
if (!l){
ast_log(LOG_WARNING, "Unable to malloc\n");
return(DC_ERROR); return(DC_ERROR);
} }
l->mode = 1; l->mode = 1;
@ -2107,8 +2093,7 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
return DC_ERROR; return DC_ERROR;
} }
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL))) {
if (!l->pchan){
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_hangup(l->chan); ast_hangup(l->chan);
free(l); free(l);
@ -4711,8 +4696,7 @@ char cmd[MAXDTMF+1] = "";
ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY); ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY);
ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY); ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
myrpt->pchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(myrpt->pchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!myrpt->pchannel)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
@ -4760,8 +4744,7 @@ char cmd[MAXDTMF+1] = "";
/* save pseudo channel conference number */ /* save pseudo channel conference number */
myrpt->conf = ci.confno; myrpt->conf = ci.confno;
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
myrpt->txpchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(myrpt->txpchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!myrpt->txpchannel)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
@ -6014,9 +5997,7 @@ static int rpt_exec(struct ast_channel *chan, void *data)
} }
l=strlen(options)+2; l=strlen(options)+2;
orig_s=ast_malloc(l); if (!(orig_s = ast_malloc(l))) {
if(!orig_s) {
ast_log(LOG_WARNING, "Out of memory\n");
return -1; return -1;
} }
s=orig_s; s=orig_s;
@ -6226,10 +6207,8 @@ static int rpt_exec(struct ast_channel *chan, void *data)
} else } else
ast_mutex_unlock(&myrpt->lock); ast_mutex_unlock(&myrpt->lock);
/* establish call in tranceive mode */ /* establish call in tranceive mode */
l = ast_calloc(1, sizeof(*l)); if (!(l = ast_calloc(1, sizeof(*l))))
if (!l)
{ {
ast_log(LOG_WARNING, "Unable to malloc\n");
pthread_exit(NULL); pthread_exit(NULL);
} }
l->mode = 1; l->mode = 1;
@ -6242,8 +6221,7 @@ static int rpt_exec(struct ast_channel *chan, void *data)
ast_set_read_format(l->chan,AST_FORMAT_SLINEAR); ast_set_read_format(l->chan,AST_FORMAT_SLINEAR);
ast_set_write_format(l->chan,AST_FORMAT_SLINEAR); ast_set_write_format(l->chan,AST_FORMAT_SLINEAR);
/* allocate a pseudo-channel thru asterisk */ /* allocate a pseudo-channel thru asterisk */
l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL); if (!(l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL)))
if (!l->pchan)
{ {
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n"); fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
pthread_exit(NULL); pthread_exit(NULL);

54
apps/app_voicemail.c
Unescape View File

@ -532,12 +532,7 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha
struct ast_variable *var, *tmp; struct ast_variable *var, *tmp;
struct ast_vm_user *retval; struct ast_vm_user *retval;
if (ivm) if ((retval = (ivm ? ivm : ast_calloc(1, sizeof(*retval))))) {
retval=ivm;
else
retval=ast_calloc(1, sizeof(*retval));
if (retval) {
if (!ivm) if (!ivm)
ast_set_flag(retval, VM_ALLOCED); ast_set_flag(retval, VM_ALLOCED);
else else
@ -596,12 +591,8 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, const char *contex
cur=cur->next; cur=cur->next;
} }
if (cur) { if (cur) {
if (ivm)
vmu = ivm;
else
/* Make a copy, so that on a reload, we have no race */ /* Make a copy, so that on a reload, we have no race */
vmu = ast_malloc(sizeof(*vmu)); if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
if (vmu) {
memcpy(vmu, cur, sizeof(*vmu)); memcpy(vmu, cur, sizeof(*vmu));
ast_set2_flag(vmu, !ivm, VM_ALLOCED); ast_set2_flag(vmu, !ivm, VM_ALLOCED);
vmu->next = NULL; vmu->next = NULL;
@ -1462,7 +1453,7 @@ static int vm_delete(char *file)
int txtsize = 0; int txtsize = 0;
txtsize = (strlen(file) + 5)*sizeof(char); txtsize = (strlen(file) + 5)*sizeof(char);
txt = (char *)alloca(txtsize); txt = alloca(txtsize);
/* Sprintf here would safe because we alloca'd exactly the right length, /* Sprintf here would safe because we alloca'd exactly the right length,
* but trying to eliminate all sprintf's anyhow * but trying to eliminate all sprintf's anyhow
*/ */
@ -1689,8 +1680,8 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c
strftime(date, sizeof(date), emaildateformat, &tm); strftime(date, sizeof(date), emaildateformat, &tm);
if (*fromstring) { if (*fromstring) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(fromstring)*3 + 200; int vmlen = strlen(fromstring)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -1706,8 +1697,8 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c
fprintf(p, "To: %s <%s>\n", vmu->fullname, vmu->email); fprintf(p, "To: %s <%s>\n", vmu->fullname, vmu->email);
if (emailsubject) { if (emailsubject) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(emailsubject)*3 + 200; int vmlen = strlen(emailsubject)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -1738,8 +1729,8 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c
} }
fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", charset); fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", charset);
if (emailbody) { if (emailbody) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(emailbody)*3 + 200; int vmlen = strlen(emailbody)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -1807,8 +1798,8 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
fprintf(p, "Date: %s\n", date); fprintf(p, "Date: %s\n", date);
if (*pagerfromstring) { if (*pagerfromstring) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(fromstring)*3 + 200; int vmlen = strlen(fromstring)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -1824,8 +1815,8 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
fprintf(p, "From: Asterisk PBX <%s>\n", who); fprintf(p, "From: Asterisk PBX <%s>\n", who);
fprintf(p, "To: %s\n", pager); fprintf(p, "To: %s\n", pager);
if (pagersubject) { if (pagersubject) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(pagersubject)*3 + 200; int vmlen = strlen(pagersubject)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -1840,8 +1831,8 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
fprintf(p, "Subject: New VM\n\n"); fprintf(p, "Subject: New VM\n\n");
strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm); strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm);
if (pagerbody) { if (pagerbody) {
struct ast_channel *ast = ast_channel_alloc(0); struct ast_channel *ast;
if (ast) { if ((ast = ast_channel_alloc(0))) {
char *passdata; char *passdata;
int vmlen = strlen(pagerbody)*3 + 200; int vmlen = strlen(pagerbody)*3 + 200;
if ((passdata = alloca(vmlen))) { if ((passdata = alloca(vmlen))) {
@ -5138,8 +5129,12 @@ static int vm_execmain(struct ast_channel *chan, void *data)
if (!valid) if (!valid)
goto out; goto out;
vms.deleted = calloc(vmu->maxmsg, sizeof(int)); if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) {
vms.heard = calloc(vmu->maxmsg, sizeof(int)); /* TODO: Handle memory allocation failure */
}
if (!(vms.heard = ast_calloc(vmu->maxmsg, sizeof(int)))) {
/* TODO: Handle memory allocation failure */
}
/* Set language from config to override channel language */ /* Set language from config to override channel language */
if (!ast_strlen_zero(vmu->language)) if (!ast_strlen_zero(vmu->language))
@ -5592,8 +5587,7 @@ static int append_mailbox(char *context, char *mbox, char *data)
struct ast_vm_user *vmu; struct ast_vm_user *vmu;
ast_copy_string(tmp, data, sizeof(tmp)); ast_copy_string(tmp, data, sizeof(tmp));
vmu = ast_calloc(1, sizeof(*vmu)); if ((vmu = ast_calloc(1, sizeof(*vmu)))) {
if (vmu) {
ast_copy_string(vmu->context, context, sizeof(vmu->context)); ast_copy_string(vmu->context, context, sizeof(vmu->context));
ast_copy_string(vmu->mailbox, mbox, sizeof(vmu->mailbox)); ast_copy_string(vmu->mailbox, mbox, sizeof(vmu->mailbox));
@ -6129,8 +6123,7 @@ static int load_config(void)
/* Timezones in this context */ /* Timezones in this context */
while (var) { while (var) {
struct vm_zone *z; struct vm_zone *z;
z = ast_malloc(sizeof(*z)); if ((z = ast_malloc(sizeof(*z)))) {
if (z != NULL) {
char *msg_format, *timezone; char *msg_format, *timezone;
msg_format = ast_strdupa(var->value); msg_format = ast_strdupa(var->value);
if (msg_format != NULL) { if (msg_format != NULL) {
@ -6157,7 +6150,6 @@ static int load_config(void)
return -1; return -1;
} }
} else { } else {
ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
return -1; return -1;
} }
var = var->next; var = var->next;

Write Preview
Loading…
Cancel
Save