Improve VA sanitization & file size retrieval

Introduced sanitize_va()

Introduced has_prefix() which now ensures "0x" prefix only when needed.

Reduced unnecessary code repetition.
Improved readability & efficiency.

Author: yourpwnguy

src/rp/main.cpp

@@ -78,9 +78,9 @@ int main(int argc, char *argv[]) {
 
     // Here we set the base being 0 if we want to have absolute virtual
     // memory address displayed
-    const uint64_t base = g_opts.va.size() > 0
-                              ? std::strtoull(g_opts.va.c_str(), nullptr, 0)
-                              : p.get_image_base_address();
+      const uint64_t base = g_opts.va.size() > 0
+                                ? std::strtoull((sanitize_va(g_opts.va)).c_str(), nullptr, 0)
+                                : p.get_image_base_address();
     if (g_opts.rop > 0) {
       const uint32_t options = g_opts.thumb ? 1 : 0;
       fmt::print("\nWait a few seconds, rp++ is looking for gadgets ({} "

src/rp/toolbox.cpp

@@ -28,19 +28,44 @@ std::string verbosity_to_string(const VerbosityLevel lvl) {
   return "Unknwon";
 }
 
+// Get the size of an open file without changing its position
 std::streampos get_file_size(std::ifstream &file) {
-  std::streampos backup = file.tellg();
 
-  file.seekg(0, std::ios::beg);
-  std::streampos fsize = file.tellg();
+  // Save the current file ptr position
+  std::streampos backup = file.tellg();
 
+  // Move the ptr to the end
   file.seekg(0, std::ios::end);
-  fsize = file.tellg() - fsize;
 
+  // Get the current file ptr position ( start = 0 + EOF )
+  std::streampos fsize = file.tellg();
+
+  // Restore the previous ptr position
   file.seekg(backup);
+
   return fsize;
 }
 
+// Helper function to check if va has prefix (0x) or not
+bool has_prefix(const std::string &va) {
+  return va.size() > 2 && va[0] == '0' && (va[1] == 'x' || va[1] == 'X');
+}
+
+/* 
+* Sanitize VA copied from WinDbg (removes backticks)
+* Ensures "0x" prefix exists when needed
+*/
+std::string sanitize_va(std::string va) {
+
+  bool needs_prefix = !has_prefix(va);
+
+  // Remove backticks if present
+  va.erase(std::remove(va.begin(), va.end(), '`'), va.end());
+
+  return needs_prefix ? "0x" + va : va;
+
+}
+
 // this function is completely inspirated from the previous work of jonathan
 // salwan
 bool is_matching(const std::string &str, const std::string &pattern) {
@@ -49,10 +74,10 @@ bool is_matching(const std::string &str, const std::string &pattern) {
     return false;
   }
 
-  size_t i = 0, max = std::min(str.length(), pattern.length());
+  size_t i = 0, maxLen = (std::min)(str.length(), pattern.length());
   bool it_matches = true;
 
-  while (i < max) {
+  while (i < maxLen) {
     if (pattern.at(i) != '?' && pattern.at(i) != str.at(i)) {
       it_matches = false;
       break;

src/rp/toolbox.hpp

@@ -25,6 +25,24 @@ enum VerbosityLevel {
  */
 std::string verbosity_to_string(const VerbosityLevel lvl);
 
+/**
+ * @brief Checks if the given virtual address has a "0x" or "0X" prefix.
+ *
+ * @param va The virtual address string.
+ * @return true if the address has a "0x"/"0X" prefix, false otherwise.
+ */
+bool has_prefix(const std::string &va);
+
+/**
+ * @brief Sanitizes a virtual address copied from WinDbg.
+ *
+ * Removes backticks from the address and ensures it has a "0x" prefix if missing.
+ *
+ * @param va The virtual address string.
+ * @return A sanitized virtual address with proper formatting.
+ */
+std::string sanitize_va(std::string va);
+
 /**
  * \fn std::streampos get_file_size(std::ifstream &file)
  * \brief Get the size in byte of your file
@@ -33,6 +51,7 @@ std::string verbosity_to_string(const VerbosityLevel lvl);
  *
  * \return the size in byte of the file
  */
+
 std::streampos get_file_size(std::ifstream &file);
 
 /**