x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG+GUI: fixed issue #1601 (comments in scripts interfering with the log)

This commit is contained in:
mrexodia 2017-05-26 20:35:03 +02:00
parent 5e77ad43e9
commit c9c0ca4c99
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dbg/simplescript.cpp
View File

@ -153,9 +153,35 @@ static bool scriptcreatelinemap(const char* filename)
//temp. remove comments from the raw line
char line_comment[256] = "";
char* comment = strstr(&cur.raw[0], "//");
if(!comment)
comment = strstr(&cur.raw[0], ";");
char* comment = nullptr;
{
auto len = strlen(cur.raw);
auto inquote = false;
auto inescape = false;
for(size_t i = 0; i < len; i++)
{
auto ch = cur.raw[i];
switch(ch) //simple state machine to determine if the "//" is in quotes
{
case '\"':
if(!inescape)
inquote = !inquote;
inescape = false;
break;
case '\\':
inescape = !inescape;
break;
default:
inescape = false;
}
if(!inquote && ch == '/' && i + 1 < len && cur.raw[i + 1] == '/')
{
comment = cur.raw + i;
break;
}
}
}
if(comment && comment != cur.raw) //only when the line doesnt start with a comment
{
if(*(comment - 1) == ' ') //space before comment
@ -227,7 +253,7 @@ static bool scriptcreatelinemap(const char* filename)
//append the comment to the raw line again
if(*line_comment)
sprintf(cur.raw + rawlen, " %s", line_comment);
sprintf(cur.raw + rawlen, "\1%s", line_comment);
linemap.at(i) = cur;
}
linemapsize = (int)linemap.size();

4
src/gui/Src/Gui/ScriptView.cpp
View File

@ -127,11 +127,11 @@ QString ScriptView::paintContent(QPainter* painter, dsint rowBase, int rowOffset
QString command = getCellContent(rowBase + rowOffset, col);
//handle comments
int comment_idx = command.indexOf("//"); //find the index of the space
int comment_idx = command.indexOf("\1"); //find the index of the comment
QString comment = "";
if(comment_idx != -1 && command.at(0) != QChar('/')) //there is a comment
{
comment = command.right(command.length() - comment_idx);
comment = command.right(command.length() - comment_idx - 1);
if(command.at(comment_idx - 1) == QChar(' '))
command.truncate(comment_idx - 1);
else