Fix performance issue (resolve #1069)

include/LIEF/MachO/BinaryParser.hpp

@@ -21,6 +21,7 @@
 #include <limits>
 #include <set>
 #include <map>
+#include <unordered_map>
 
 #include "LIEF/visibility.h"
 #include "LIEF/errors.hpp"
@@ -241,7 +242,7 @@ class LIEF_API BinaryParser : public LIEF::Parser {
   bool                           is64_ = true;
   ParserConfig                   config_;
   std::set<uint64_t>             visited_;
-  std::map<std::string, Symbol*> memoized_symbols_;
+  std::unordered_map<std::string, Symbol*> memoized_symbols_;
   std::map<uint64_t, Symbol*>    memoized_symbols_by_address_;
 
   std::vector<DylibCommand*> binding_libs_;

include/LIEF/utils.hpp

@@ -89,9 +89,6 @@ LIEF_API std::string hex_dump(const std::vector<uint8_t>& data,
 LIEF_API std::string hex_dump(span<const uint8_t> data,
                               const std::string& sep = ":");
 
-//! Check if the given string in printable
-LIEF_API bool is_printable(const std::string& str);
-
 //! Check if the given number is a hex-like string
 LIEF_API bool is_hex_number(const std::string& nb);
 }

src/MachO/BinaryParser.cpp

@@ -27,7 +27,7 @@
 #include "LIEF/MachO/ExportInfo.hpp"
 #include "LIEF/MachO/DyldExportsTrie.hpp"
 
-#include "LIEF/utils.hpp"
+#include "internal_utils.hpp"
 
 namespace LIEF {
 namespace MachO {
@@ -302,10 +302,9 @@ ok_error_t BinaryParser::parse_export_trie(exports_list_t& exports, uint64_t sta
       break;
     }
 
-    if (visited_.count(start + child_node_offet) > 0) {
+    if (!visited_.insert(start + child_node_offet).second) {
       break;
     }
-    visited_.insert(start + child_node_offet);
     size_t current_pos = stream_->pos();
     stream_->setpos(start + child_node_offet);
     parse_export_trie(exports, start, end, name, invalid_names);

src/internal_utils.cpp

@@ -16,10 +16,6 @@
 #include "internal_utils.hpp"
 namespace LIEF {
 
-inline bool is_printable(char c) {
-  return static_cast<bool>(::isprint(c)) && c != '\n' && c != '\r';
-}
-
 std::string printable_string(const std::string& str) {
   std::string out;
   out.reserve(str.size());

src/internal_utils.hpp

@@ -30,6 +30,16 @@
 namespace LIEF {
 std::string printable_string(const std::string& str);
 
+inline bool is_printable(char c) {
+  return ' ' <= c && c <= '~';
+}
+
+inline bool is_printable(const std::string& str) {
+  return std::all_of(std::begin(str), std::end(str),
+    [] (char c) { return is_printable(c); }
+  );
+}
+
 template<class T>
 inline std::vector<T> as_vector(span<T> s) {
   return std::vector<T>(s.begin(), s.end());
@@ -163,6 +173,7 @@ std::vector<std::string> optimize(const HANDLER& container,
 
   return string_table_optimized;
 }
+
 }
 
 #endif

src/utils.cpp

@@ -128,11 +128,6 @@ std::string hex_dump(span<const uint8_t> data, const std::string& sep) {
 }
 
 
-bool is_printable(const std::string& str) {
-  return std::all_of(std::begin(str), std::end(str),
-                     [] (char c) { return std::isprint<char>(c, std::locale("C")); });
-}
-
 bool is_hex_number(const std::string& str) {
   return std::all_of(std::begin(str), std::end(str), isxdigit);
 }