luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inpptree.c, fix premature memory allocation

This commit is contained in:
rlar 2012-04-05 21:24:25 +02:00
parent 3375e1b976
commit 42653f7c3d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/spicelib/parser/inpptree.c
View File

@ -547,7 +547,7 @@ static INPparseNode *mkcon(double value)
static INPparseNode *mkb(int type, INPparseNode * left,
INPparseNode * right)
{
INPparseNode *p = TMALLOC(INPparseNode, 1);
INPparseNode *p;
int i;
if ((right->type == PT_CONSTANT) && (left->type == PT_CONSTANT)) {
@ -621,6 +621,8 @@ static INPparseNode *mkb(int type, INPparseNode * left,
break;
}
p = TMALLOC(INPparseNode, 1);
p->type = type;
p->left = left;
p->right = right;
@ -647,9 +649,8 @@ static INPparseNode *mkb(int type, INPparseNode * left,
static INPparseNode *mkf(int type, INPparseNode * arg)
{
INPparseNode *p = TMALLOC(INPparseNode, 1);
INPparseNode *p;
int i;
double constval;
for (i = 0; i < NUM_FUNCS; i++)
if (funcs[i].number == type)
@ -660,10 +661,12 @@ static INPparseNode *mkf(int type, INPparseNode * arg)
}
if (arg->type == PT_CONSTANT) {
constval = PTunary(funcs[i].funcptr) (arg->constant);
double constval = PTunary(funcs[i].funcptr) (arg->constant);
return (mkcon(constval));
}
p = TMALLOC(INPparseNode, 1);
p->type = PT_FUNCTION;
p->left = arg;
@ -726,6 +729,7 @@ static INPparseNode *mkbnode(const char *opstr, INPparseNode * arg1,
fprintf(stderr, "Internal Error: no such op num %s\n", opstr);
return (NULL);
}
p = TMALLOC(INPparseNode, 1);
p->type = ops[i].number;
@ -833,8 +837,6 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
(void) strcpy(buf, fname);
strtolower(buf);
p = TMALLOC(INPparseNode, 1);
if(!strcmp("ternary_fcn", buf)) {
// extern void printTree(INPparseNode *);
@ -851,6 +853,8 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
INPparseNode *arg2 = arg->left->right;
INPparseNode *arg3 = arg->right;
p = TMALLOC(INPparseNode, 1);
p->type = PT_TERN;
p->left = arg1;
p->right = mkb(PT_COMMA, arg2, arg3);
@ -867,6 +871,8 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
return (NULL);
}
p = TMALLOC(INPparseNode, 1);
p->type = PT_FUNCTION;
p->left = arg;
p->funcname = funcs[i].name;