preproc: fix exit conditions for indirection loop

When locating the end of a %[...] construct, we need to end up with
the pointer pointing to the terminating character.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/preproc.c b/preproc.c
index 434383b5..0b7ec1c8 100644
--- a/preproc.c
+++ b/preproc.c
@@ -810,26 +810,25 @@ static Token *tokenize(char *line)
 		int lvl = 1;
 		line += 2;	/* Skip the leading %[ */
 		p++;
-		while (lvl && (c = *p)) {
+		while (lvl && (c = *p++)) {
 		    switch (c) {
 		    case ']':
 			lvl--;
 			break;
 		    case '%':
-			p++;
 			if (*p == '[')
 			    lvl++;
 			break;
 		    case '\'':
 		    case '\"':
 		    case '`':
-			p = nasm_skip_string(p);
+			p = nasm_skip_string(p)+1;
 			break;
 		    default:
 			break;
 		    }
-		    p++;
 		}
+		p--;
 		if (*p)
 		    *p++ = '\0';
 		type = TOK_INDIRECT;