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

DBG: resolved issue #544 ([[esp]] now works as it's supposed to)

This commit is contained in:
mrexodia 2016-02-18 02:41:19 +01:00
parent 359a2ae392
commit 23c0dc6f5c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dbg/expressionparser.cpp
View File

@ -106,7 +106,7 @@ String ExpressionParser::fixClosingBrackets(const String & expression)
void ExpressionParser::tokenize(const String & expression)
{
bool stateMemory = false;
auto stateMemory = 0;
size_t len = expression.length();
for(size_t i = 0; i < len; i++)
{
@ -115,14 +115,15 @@ void ExpressionParser::tokenize(const String & expression)
{
case '[':
{
stateMemory = true;
stateMemory++;
_curToken += ch;
}
break;
case ']':
{
stateMemory = false;
if(stateMemory)
stateMemory--;
_curToken += ch;
}
break;

34
src/dbg/value.cpp
View File

@ -1523,30 +1523,34 @@ bool valfromstring_noexpr(const char* string, duint* value, bool silent, bool ba
}
int len = (int)strlen(string);
String newstring;
bool foundStart = false;
for(int i = 0; i < len; i++)
{
if(string[i] == '[')
foundStart = true;
else if(string[i] == ']')
break;
else if(foundStart)
newstring += string[i];
}
int read_size = sizeof(duint);
int add = 1;
if(string[1] == ':') //n:[ (number of bytes to read)
if(string[1] == ':') //n:[ (number of bytes to read)
{
add += 2;
int new_size = string[0] - '0';
if(new_size < read_size)
read_size = new_size;
}
if(!valfromstring(newstring.c_str(), value, silent, baseonly))
String ptrstring;
for(auto i = add, depth = 1; i < len; i++)
{
dprintf("noexpr failed on %s\n", newstring.c_str());
if(string[i] == '[')
depth++;
else if(string[i] == ']')
{
depth--;
if(!depth)
break;
}
ptrstring += string[i];
}
dprintf("string: %s, ptrstring: %s\n", string, ptrstring.c_str());
if(!valfromstring(ptrstring.c_str(), value, silent, baseonly))
{
dprintf("noexpr failed on %s\n", ptrstring.c_str());
return false;
}
duint addr = *value;