Introduce sanitize_va() & has_prefix() for VA formatting

src/rp/main.cpp

@@ -30,8 +30,9 @@
 Options_t g_opts;
 
 int main(int argc, char *argv[]) {
-  CLI::App rp("rp++: a fast ROP gadget finder for pe/elf/mach-o x86/x64/ARM/ARM64 "
-              "binaries\nby Axel '0vercl0k' Souchet.\n");
+  CLI::App rp(
+      "rp++: a fast ROP gadget finder for pe/elf/mach-o x86/x64/ARM/ARM64 "
+      "binaries\nby Axel '0vercl0k' Souchet.\n");
   rp.add_option("-f,--file", g_opts.file, "Binary path")->required();
   rp.add_option("-i,--info", g_opts.display,
                 "display information about the binary header");
@@ -58,7 +59,7 @@ int main(int argc, char *argv[]) {
   rp.add_flag("--thumb", g_opts.thumb,
               "enable thumb mode when looking for ARM gadgets");
   rp.add_option("--va", g_opts.va,
-              "don't use the image base of the binary, but yours instead");
+                "don't use the image base of the binary, but yours instead");
   rp.add_flag("--allow-branches", g_opts.allow_branches,
               "allow branches in a gadget");
   rp.add_flag("--print-bytes", g_opts.print_bytes, "print the gadget bytes");
@@ -78,9 +79,8 @@ 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 ? va_to_integer(g_opts.va)
+                                               : 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

@@ -41,6 +41,22 @@ std::streampos get_file_size(std::ifstream &file) {
   return fsize;
 }
 
+uint64_t va_to_integer(std::string va) {
+  // Look for backticks; WinDbg splits a QWORD in two with one. We'll get rid of
+  // it if we find one as this makes it easier to copy the address directly off
+  // the debugger. It also means that if we find one, we'll assume the address
+  // is specified in base 16 so we'll force that.
+  const auto it = std::remove(va.begin(), va.end(), '`');
+  const int radix = it != va.end() ? 16 : 0;
+  // If `std::remove` returned a valid iterator, this is where we want
+  // `strtoull` to stop; so let's terminate the string there.
+  if (it != va.end()) {
+    *it = 0;
+  }
+
+  return std::strtoull(va.c_str(), nullptr, radix);
+}
+
 // this function is completely inspirated from the previous work of jonathan
 // salwan
 bool is_matching(const std::string &str, const std::string &pattern) {

src/rp/toolbox.hpp

@@ -25,6 +25,14 @@ enum VerbosityLevel {
  */
 std::string verbosity_to_string(const VerbosityLevel lvl);
 
+/**
+ * \fn uint64_t va_to_integer(std::string va)
+ * \brief Convert va to an integer
+ *
+ * \param va The virtual address string
+ */
+uint64_t va_to_integer(std::string va);
+
 /**
  * \fn std::streampos get_file_size(std::ifstream &file)
  * \brief Get the size in byte of your file

src/third_party/capstone/MathExtras.h

@@ -17,11 +17,13 @@
 #ifndef CS_LLVM_SUPPORT_MATHEXTRAS_H
 #define CS_LLVM_SUPPORT_MATHEXTRAS_H
 
+#if 0
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 0x800)
 #include "windowsce/intrin.h"
 #elif defined(_MSC_VER)
 #include <intrin.h>
 #endif
+#endif
 
 #ifndef __cplusplus
 #if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64)