[nasm:master] Fixed optional comma separator in %strcat

nasm-bot for Igor Glucksmann 33635651+igg0 at users.noreply.github.com
Mon Nov 7 17:12:24 PST 2022


Commit-ID:  349f19d402b89820a852e3fbf96b1e332edbab0c
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=349f19d402b89820a852e3fbf96b1e332edbab0c
Author:     Igor Glucksmann <33635651+igg0 at users.noreply.github.com>
AuthorDate: Wed, 2 Feb 2022 17:09:06 +0100
Committer:  Igor Glucksmann <33635651+igg0 at users.noreply.github.com>
CommitDate: Wed, 2 Feb 2022 17:09:06 +0100

Fixed optional comma separator in %strcat

Signed-off-by: "Glücksmann, Igor" <igor.glucksmann at avast.com>


---
 asm/preproc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/asm/preproc.c b/asm/preproc.c
index cb1669da..0ff2b518 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -4709,15 +4709,12 @@ issue_error:
         list_for_each(t, tline) {
             switch (t->type) {
             case TOKEN_WHITESPACE:
+            case TOKEN_COMMA:
                 break;
             case TOKEN_STR:
 		unquote_token(t);
                 len += t->len;
                 break;
-            case TOKEN_OTHER:
-                if (tok_is(t, ',')) /* permit comma separators */
-                    break;
-                /* else fall through */
             default:
                 nasm_nonfatal("non-string passed to `%s': %s", dname,
 			      tok_text(t));


More information about the Nasm-commits mailing list