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

nupa_substitute(), ls ==> s_end - (const) s

This commit is contained in:
rlar 2016-05-05 11:50:58 +02:00
parent fb3a1be6a5
commit 4af5a78bb5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/frontend/numparam/xpressn.c
View File

@ -1205,8 +1205,9 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
spice_dstring_init(&tstr); spice_dstring_init(&tstr);
i = 0; i = 0;
const int ls = (int) strlen(s); const int ls = (int) strlen(s);
const char * const s_end = s + ls;
while ((i < ls) && !err) { while ((i < (s_end - s)) && !err) {
i++; i++;
c = s[i - 1]; c = s[i - 1];
@ -1250,13 +1251,13 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
} else if (c == Intro) { } else if (c == Intro) {
/* skip "&&" which may occur in B source */ /* skip "&&" which may occur in B source */
if ((i + 1 < ls) && (s[i] == Intro)) { if ((i + 1 < (s_end - s)) && (s[i] == Intro)) {
i++; i++;
continue; continue;
} }
i++; i++;
while ((i < ls) && (s[i - 1] <= ' ')) while ((i < (s_end - s)) && (s[i - 1] <= ' '))
i++; i++;
k = i; k = i;
@ -1268,7 +1269,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
do do
{ {
k++; k++;
if (k > ls) if (k > (s_end - s))
d = '\0'; d = '\0';
else else
d = s[k - 1]; d = s[k - 1];
@ -1278,9 +1279,9 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
else if (d == ')') else if (d == ')')
level--; level--;
} while ((k <= ls) && !((d == ')') && (level <= 0))); } while ((k <= (s_end - s)) && !((d == ')') && (level <= 0)));
if (k > ls) { if (k > (s_end - s)) {
err = message(dico, "Closing \")\" not found.\n"); err = message(dico, "Closing \")\" not found.\n");
} else { } else {
pscopy(&tstr, s, i, k - i - 1); pscopy(&tstr, s, i, k - i - 1);
@ -1296,12 +1297,12 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
do do
{ {
k++; k++;
if (k > ls) if (k > (s_end - s))
d = '\0'; d = '\0';
else else
d = s[k - 1]; d = s[k - 1];
} while ((k <= ls) && (d > ' ')); } while ((k <= (s_end - s)) && (d > ' '));
pscopy(&tstr, s, i-1, k - i); pscopy(&tstr, s, i-1, k - i);
const char *xx = spice_dstring_value(&tstr); const char *xx = spice_dstring_value(&tstr);