mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
use ast_calloc for memory allocations
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -115,7 +115,7 @@
|
||||
|
||||
|
||||
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
|
||||
#line 50 "ael.y"
|
||||
#line 51 "ael.y"
|
||||
typedef union YYSTYPE {
|
||||
char *str;
|
||||
struct pval *pval;
|
||||
|
@@ -25,6 +25,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "asterisk/logger.h"
|
||||
#include "asterisk/utils.h" /* ast_calloc() */
|
||||
#include "asterisk/ael_structs.h"
|
||||
|
||||
static pval *npval(pvaltype type, int first_line, int last_line,
|
||||
@@ -437,7 +438,7 @@ statement : LC statements RC {
|
||||
tot++; /* for a sep like a comma */
|
||||
}
|
||||
tot+=4; /* for safety */
|
||||
bufx = (char *)malloc(tot);
|
||||
bufx = ast_calloc(1, tot);
|
||||
strcpy(bufx,$1->u1.str);
|
||||
strcat(bufx,"(");
|
||||
/* XXX need to advance the pointer or the loop is very inefficient */
|
||||
@@ -803,7 +804,7 @@ static char *ael_token_subst(char *mess)
|
||||
}
|
||||
len++;
|
||||
}
|
||||
res = (char*)malloc(len+1);
|
||||
res = ast_calloc(1, len+1);
|
||||
res[0] = 0;
|
||||
s = res;
|
||||
for (p=mess; *p;) {
|
||||
@@ -843,7 +844,7 @@ static struct pval *npval(pvaltype type, int first_line, int last_line,
|
||||
int first_column, int last_column)
|
||||
{
|
||||
extern char *my_file;
|
||||
pval *z = (pval *)calloc(sizeof(struct pval),1);
|
||||
pval *z = ast_calloc(1, sizeof(struct pval));
|
||||
z->type = type;
|
||||
z->startline = first_line;
|
||||
z->endline = last_line;
|
||||
|
Reference in New Issue
Block a user