From a1af921a6e20943f1610d032dbfa0bf7c105a522 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 12 Dec 2010 19:37:58 +0000 Subject: [PATCH] do not parse $variable stuff inside //comments git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10655 d7cf8633-e32d-0410-b094-e92efae38249 --- cmd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cmd.c b/cmd.c index 995473c6..cbff83aa 100644 --- a/cmd.c +++ b/cmd.c @@ -281,7 +281,8 @@ void Cbuf_Execute (void) char line[MAX_INPUTLINE]; char preprocessed[MAX_INPUTLINE]; char *firstchar; - qboolean quotes, comment; + qboolean quotes; + char *comment; // LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes cmd_tokenizebufferpos = 0; @@ -293,7 +294,7 @@ void Cbuf_Execute (void) text = (char *)cmd_text.data; quotes = false; - comment = false; + comment = NULL; for (i=0 ; i < cmd_text.cursize ; i++) { if(!comment) @@ -311,7 +312,7 @@ void Cbuf_Execute (void) else { if(text[i] == '/' && text[i + 1] == '/' && (i == 0 || ISWHITESPACE(text[i-1]))) - comment = true; + comment = &text[i]; if(text[i] == ';') break; // don't break if inside a quoted string or comment } @@ -329,8 +330,8 @@ void Cbuf_Execute (void) } else { - memcpy (line, text, i); - line[i] = 0; + memcpy (line, text, comment ? (comment - text) : i); + line[comment ? (comment - text) : i] = 0; } // delete the text from the command buffer and move remaining commands down @@ -347,13 +348,15 @@ void Cbuf_Execute (void) } // execute the command line - firstchar = line + strspn(line, " \t"); + firstchar = line; + while(*firstchar && ISWHITESPACE(*firstchar)) + ++firstchar; if( - (strncmp(firstchar, "alias", 5) || (firstchar[5] != ' ' && firstchar[5] != '\t')) + (strncmp(firstchar, "alias", 5) || !ISWHITESPACE(firstchar[5])) && - (strncmp(firstchar, "bind", 4) || (firstchar[4] != ' ' && firstchar[4] != '\t')) + (strncmp(firstchar, "bind", 4) || !ISWHITESPACE(firstchar[4])) && - (strncmp(firstchar, "in_bind", 7) || (firstchar[7] != ' ' && firstchar[7] != '\t')) + (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7])) ) { Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL ); -- 2.39.2