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

Merge pull request #3281 from foralost/3238_File_does_not_exists_bracket 

#3238: Escaping { from any command argument
This commit is contained in:
Duncan Ogilvie 2023-11-26 17:16:12 +01:00 committed by GitHub
parent 93ac4548f7 16fccbd2d4
commit b17fc86af7
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/Src/Gui/MainWindow.cpp
View File

@ -1248,7 +1248,7 @@ void MainWindow::openFileSlot()
void MainWindow::openRecentFileSlot(QString filename)
{
DbgCmdExec(QString().sprintf("init \"%s\"", filename.toUtf8().constData()));
DbgCmdExec(QString().sprintf("init \"%s\"", DbgCmdEscape(filename).toUtf8().constData()));
}
void MainWindow::runSlot()
@ -1263,7 +1263,7 @@ void MainWindow::restartDebugging()
{
auto last = mMRUList->getEntry(0);
if(!last.isEmpty())
DbgCmdExec(QString("init \"%1\"").arg(last));
DbgCmdExec(QString("init \"%1\"").arg(DbgCmdEscape(last)));
}
void MainWindow::displayBreakpointWidget()
@ -1281,10 +1281,11 @@ void MainWindow::dragEnterEvent(QDragEnterEvent* pEvent)
void MainWindow::dropEvent(QDropEvent* pEvent)
{
if(pEvent->mimeData()->hasUrls())
{
QString filename = QDir::toNativeSeparators(pEvent->mimeData()->urls()[0].toLocalFile());
DbgCmdExec(QString().sprintf("init \"%s\"", filename.toUtf8().constData()));
DbgCmdExec(QString().sprintf("init \"%s\"", DbgCmdEscape(filename).toUtf8().constData()));
pEvent->acceptProposedAction();
}
}

1
src/gui/Src/Utils/StringUtil.cpp
View File

@ -295,6 +295,7 @@ QString DbgCmdEscape(QString argument)
{
// TODO: implement this properly
argument.replace("\"", "\\\"");
argument.replace("{", "\\{");
return argument;
}