Fix a nullptr dereference in dbglistprocesses. Thanks to @HydrophonePia!

Closes #3075
x64dbg · Apr 27, 2023 · a811063 · a811063
1 parent 1845952
commit a811063
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/dbg/commands/cmd-script.cpp b/src/dbg/commands/cmd-script.cpp
@@ -35,6 +35,8 @@ bool cbScriptCmd(int argc, char* argv[])
     if(IsArgumentsLessThan(argc, 2))
         return false;
     auto scriptcmd = strchr(argv[0], ' ');
+    if(scriptcmd == nullptr)
+        return false;
     while(isspace(*scriptcmd))
         scriptcmd++;
     return scriptcmdexec(scriptcmd);

diff --git a/src/dbg/debugger.cpp b/src/dbg/debugger.cpp
@@ -2320,7 +2320,8 @@ bool dbglistprocesses(std::vector<PROCESSENTRY32>* infoList, std::vector<std::st
                     Memory<char*> basicName(strlen(exeName) + 1, "dbglistprocesses:basicName");
                     strncpy_s(basicName(), sizeof(char) * strlen(exeName) + 1, exeName, _TRUNCATE);
                     char* dotInName = strrchr(basicName(), '.');
-                    dotInName[0] = '\0';
+                    if(dotInName != nullptr)
+                        dotInName[0] = '\0';
                     size_t basicNameLen = strlen(basicName());
                     peNameInCmd = strstr(cmdline, basicName());
                     //check for basic name is used in path to exe

diff --git a/src/dbg/plugin_loader.cpp b/src/dbg/plugin_loader.cpp
@@ -960,7 +960,9 @@ void pluginmenuentrysethotkey(int pluginHandle, int hEntry, const char* hotkey)
                 {
                     char name[MAX_PATH] = "";
                     strcpy_s(name, plugin.plugname);
-                    *strrchr(name, '.') = '\0';
+                    auto dot = strrchr(name, '.');
+                    if(dot != nullptr)
+                        *dot = '\0';
                     auto hack = StringUtils::sprintf("%s\1%s_%d", hotkey, name, hEntry);
                     GuiMenuSetEntryHotkey(currentMenu.hEntryMenu, hack.c_str());
                     break;