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

inpcom.c, inp_get_func_from_line(), consider whitespace and syntax errors

This commit is contained in:
rlar 2014-08-08 18:35:04 +02:00
parent 999967ae05
commit 0e4b3f3b5b
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/frontend/inpcom.c
View File

@ -2860,31 +2860,36 @@ inp_get_func_from_line(struct function_env *env, char *line)
end = skip_ws(end);
if (*end != '(') {
fprintf(stderr, "ERROR: .func syntax, did not find opening parenthesis in str: %s\n", orig_line);
controlled_exit(EXIT_FAILURE);
}
if (*end != '(')
goto Lerror;
end = skip_ws(end + 1);
/* get function parameters */
while (*end && *end != ')') {
char *beg = skip_ws(end + 1);
end = beg;
for (;;) {
char *beg = end;
while (*end && !isspace(*end) && *end != ',' && *end != ')')
end++;
if (end > beg)
new_function_parameter(function, copy_substring(beg, end));
if (end == beg)
break;
new_function_parameter(function, copy_substring(beg, end));
end = skip_ws(end);
if (*end != ',')
break;
end = skip_ws(end + 1);
if (*end == ')')
goto Lerror;
}
if (*end != ')')
goto Lerror;
/* skip to the beinning of the function body */
end = strchr(end, '{');
end = skip_ws(end + 1);
if (!end) {
fprintf(stderr, "ERROR: .func syntax, did not find opening brace in str: %s\n", orig_line);
controlled_exit(EXIT_FAILURE);
}
if (*end != '{')
goto Lerror;
end++;
end = skip_ws(end + 1);
/* get function body */
str_len = 0;
@ -2897,6 +2902,19 @@ inp_get_func_from_line(struct function_env *env, char *line)
function->macro = strdup(temp_buf);
if (*end != '}')
goto Lerror;
end = skip_ws(end + 1);
if (*end != '\0') {
Lerror:
// fixme, free()
fprintf(stderr, "ERROR: faild to parse .func in: %s\n", orig_line);
controlled_exit(EXIT_FAILURE);
return;
}
{
int i;