diff --git a/GleeBug/Debugger.Process.Memory.cpp b/GleeBug/Debugger.Process.Memory.cpp index 58ab6e5..365e738 100644 --- a/GleeBug/Debugger.Process.Memory.cpp +++ b/GleeBug/Debugger.Process.Memory.cpp @@ -101,12 +101,13 @@ namespace GleeBug return MemWrite(data, buffer.data(), datasize, nullptr, safe); } - bool Process::MemSearchAndReplacePattern(ptr data, size_t datasize, const Pattern::WildcardPattern & searchpattern, const Pattern::WildcardPattern & replacepattern, bool safe) + bool Process::MemSearchAndReplace(ptr data, size_t datasize, const Pattern::WildcardPattern & searchpattern, const Pattern::WildcardPattern & replacepattern, bool safe) { std::vector buffer(datasize); if (!MemRead(data, buffer.data(), datasize, nullptr, safe)) return false; - Pattern::SearchAndReplace(buffer.data(), datasize, searchpattern, replacepattern); + if (!Pattern::SearchAndReplace(buffer.data(), datasize, searchpattern, replacepattern)) + return false; return MemWrite(data, buffer.data(), datasize, nullptr, safe); } }; \ No newline at end of file diff --git a/GleeBug/Debugger.Process.h b/GleeBug/Debugger.Process.h index 8c15ac5..f4657f5 100644 --- a/GleeBug/Debugger.Process.h +++ b/GleeBug/Debugger.Process.h @@ -182,7 +182,7 @@ namespace GleeBug \param safe Use the safe memory functions (eg do not consider software breakpoint data). \return true if it succeeds, false if it fails. */ - bool MemSearchAndReplacePattern(ptr data, size_t datasize, const Pattern::WildcardPattern & searchpattern, const Pattern::WildcardPattern & replacepattern, bool safe = true); + bool MemSearchAndReplace(ptr data, size_t datasize, const Pattern::WildcardPattern & searchpattern, const Pattern::WildcardPattern & replacepattern, bool safe = true); /** \brief Search and replace a pattern in process memory. @@ -193,9 +193,9 @@ namespace GleeBug \param safe Use the safe memory functions (eg do not consider software breakpoint data). \return true if it succeeds, false if it fails. */ - bool MemSearchAndReplacePattern(ptr data, size_t datasize, const std::string & searchpattern, const std::string & replacepattern, bool safe = true) + bool MemSearchAndReplace(ptr data, size_t datasize, const std::string & searchpattern, const std::string & replacepattern, bool safe = true) { - return MemSearchAndReplacePattern(data, datasize, Pattern::Transform(searchpattern), Pattern::Transform(replacepattern), safe); + return MemSearchAndReplace(data, datasize, Pattern::Transform(searchpattern), Pattern::Transform(replacepattern), safe); } /**