github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-01-13 23:36:03 +00:00
Code Issues Projects Releases Wiki Activity

Nested delimited strings had an infinite loop.

Browse Source 
The code for nested and unnested strings was mixed, thereby being too
simple for the nested case. I separated them, which is simpler than
the fixed combined version.
Detected by the macro call
        ..EMIT <$FAC=^D<fb$rea>>
This commit is contained in:
Olaf Seibert 2015-05-12 21:40:13 +02:00
parent 749b0a5d73
commit a8b5272bb8
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
parse.c
View File

@ -569,10 +569,10 @@ int brackrange(
endlen = 1;
*start = 1;
break;
case '/': /* seen on page 6-52 */
case '?': /* seen on page 6-52 */
case '\\': /* seen on page 6-52 */
case '"': /* seen in Kermit-11 source for RT11 */
case '/': /* seen on page 6-52 */
case '?': /* seen on page 6-52 */
case '\\': /* seen on page 6-52 */
case '"': /* seen in Kermit-11 source for RT11 */
endstr[0] = cp[0];
strcpy(endstr + 1, "\n");
*start = 1;
@ -585,15 +585,28 @@ int brackrange(
cp += *start;
len = 0;
nest = 1;
while (nest) {
if (endstr[1] == '>') { /* <>\n */
nest = 1;
while (nest) {
int sublen;
sublen = strcspn(cp + len, endstr);
if (cp[len + sublen] == '<') {
nest++;
sublen++; /* avoid infinite loop when sublen == 0 */
} else {
nest--;
if (nest > 0 && cp[len + sublen] == '>')
sublen++; /* avoid infinite loop when sublen == 0 */
}
len += sublen;
if (sublen == 0)
break;
}
} else {
int sublen;
sublen = strcspn(cp + len, endstr);
if (cp[len + sublen] == '<')
nest++;
else
nest--;
len += sublen;
}