Fix memory leaks in the MachO Python API and create FatBinary

API Changes:

LIEF::MachO::Parser won't return a 'std::vector' of MachO::Binary*
but a pointer to MachO::FatBinary object
It's a kind of wrapper on std::vector<MachO::Binary*>

Author: romainthomas

CMakeLists.txt

@@ -242,7 +242,8 @@ set(LIBFUZZER_SRC_FILES)
 if (LIEF_FUZZING)
   message(STATUS "Fuzzing Enabled")
 
-  set(LIBFUZZER_URL "http://llvm.org/svn/llvm-project/llvm/trunk/lib/Fuzzer")
+  set(LIBFUZZER_VERSION 314494)
+  set(LIBFUZZER_URL     "http://llvm.org/svn/llvm-project/llvm/trunk/lib/Fuzzer/") #\?p=${LIBFUZZER_VERSION}")
   ExternalProject_Add(lief_libfuzzer
   SVN_REPOSITORY    ${LIBFUZZER_URL}
   CONFIGURE_COMMAND ""

api/c/MachO/Parser.cpp

@@ -23,18 +23,18 @@
 using namespace LIEF::MachO;
 
 Macho_Binary_t** macho_parse(const char *file) {
-  std::vector<Binary*> macho_binaries{Parser::parse(file)};
+  FatBinary* macho_binaries = Parser::parse(file);
 
   Macho_Binary_t** c_macho_binaries = static_cast<Macho_Binary_t**>(
-      malloc((macho_binaries.size() + 1) * sizeof(Macho_Binary_t**)));
+      malloc((macho_binaries->size() + 1) * sizeof(Macho_Binary_t**)));
 
-  for (size_t i = 0; i < macho_binaries.size(); ++i) {
-    Binary* binary = macho_binaries [i];
+  for (size_t i = 0; i < macho_binaries->size(); ++i) {
+    Binary& binary = (*macho_binaries)[i];
     c_macho_binaries[i] = static_cast<Macho_Binary_t*>(malloc(sizeof(Macho_Binary_t)));
-    init_c_binary(c_macho_binaries[i], binary);
+    init_c_binary(c_macho_binaries[i], &binary);
   }
 
-  c_macho_binaries[macho_binaries.size()] = nullptr;
+  c_macho_binaries[macho_binaries->size()] = nullptr;
 
   return c_macho_binaries;
 }

api/python/MachO/CMakeLists.txt

@@ -2,6 +2,7 @@ set(LIEF_PYTHON_MACHO_SRC
   "${CMAKE_CURRENT_LIST_DIR}/pyMachO.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/objects/pyDylibCommand.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/objects/pyBinary.cpp"
+  "${CMAKE_CURRENT_LIST_DIR}/objects/pyFatBinary.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/objects/pyLoadCommand.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/objects/pySegmentCommand.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/objects/pyHeader.cpp"

api/python/MachO/objects/pyFatBinary.cpp

@@ -0,0 +1,60 @@
+/* Copyright 2017 R. Thomas
+ * Copyright 2017 Quarkslab
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <algorithm>
+
+#include "LIEF/MachO/FatBinary.hpp"
+
+#include "pyMachO.hpp"
+
+
+void init_MachO_FatBinary_class(py::module& m) {
+
+
+  py::class_<FatBinary>(m, "FatBinary")
+
+    .def_property_readonly("size",
+      &FatBinary::size,
+      "Number of " RST_CLASS_REF(lief.MachO.Binary) " registred")
+
+    .def("at",
+      static_cast<Binary& (FatBinary::*)(size_t)>(&FatBinary::at),
+      "Return the " RST_CLASS_REF(lief.MachO.Binary) " at the given index",
+      "index"_a)
+
+    .def("__len__",
+        &FatBinary::size)
+
+
+    .def("__getitem__",
+        static_cast<Binary& (FatBinary::*)(size_t)>(&FatBinary::operator[]),
+        "",
+        py::return_value_policy::reference)
+
+    .def("__iter__",
+        static_cast<it_binaries (FatBinary::*)(void)>(&FatBinary::begin),
+        py::return_value_policy::reference_internal)
+
+    .def("__str__",
+        [] (const FatBinary& fat_binary)
+        {
+          std::ostringstream stream;
+          stream << fat_binary;
+          std::string str = stream.str();
+          return str;
+        });
+
+}
+

api/python/MachO/objects/pyParser.cpp

@@ -24,14 +24,14 @@ void init_MachO_Parser_class(py::module& m) {
 
   // Parser (Parser)
   m.def("parse",
-    static_cast<std::vector<Binary*> (*) (const std::string&)>(&LIEF::MachO::Parser::parse),
+    static_cast<FatBinary* (*) (const std::string&)>(&LIEF::MachO::Parser::parse),
     "Parse the given binary and return a **list** of " RST_CLASS_REF(lief.MachO.Binary) " objects",
     "filename"_a,
     py::return_value_policy::take_ownership);
 
 
   m.def("parse",
-    static_cast<std::vector<Binary*> (*) (const std::vector<uint8_t>&, const std::string&)>(&LIEF::MachO::Parser::parse),
+    static_cast<FatBinary* (*) (const std::vector<uint8_t>&, const std::string&)>(&LIEF::MachO::Parser::parse),
     "Parse the given binary (from raw) and return a **list** of " RST_CLASS_REF(lief.MachO.Binary) " objects",
     py::arg("raw"), py::arg("name") = "",
     py::return_value_policy::take_ownership);

api/python/MachO/pyMachO.cpp

@@ -23,10 +23,9 @@
 void init_MachO_module(py::module& m) {
   py::module LIEF_MachO_module = m.def_submodule("MachO", "Python API for MachO");
 
-  py::bind_vector<std::vector<Binary*>>(m, "macho_list");
-
   // Objects
   init_MachO_Parser_class(LIEF_MachO_module);
+  init_MachO_FatBinary_class(LIEF_MachO_module);
   init_MachO_Binary_class(LIEF_MachO_module);
   init_MachO_Header_class(LIEF_MachO_module);
   init_MachO_LoadCommand_class(LIEF_MachO_module);

api/python/MachO/pyMachO.hpp

@@ -27,6 +27,7 @@ using namespace LIEF::MachO;
 PYBIND11_MAKE_OPAQUE(std::vector<Binary*>)
 
 void init_MachO_Parser_class(py::module&);
+void init_MachO_FatBinary_class(py::module&);
 void init_MachO_Binary_class(py::module&);
 void init_MachO_Header_class(py::module&);
 void init_MachO_LoadCommand_class(py::module&);

api/python/pyIterators.cpp

@@ -63,6 +63,7 @@ void init_LIEF_iterators(py::module& m) {
   // MachO
   // =====
 #if defined(LIEF_MACHO_MODULE)
+  init_ref_iterator<LIEF::MachO::it_binaries>(m);
   init_ref_iterator<LIEF::MachO::it_relocations>(m);
   init_ref_iterator<LIEF::MachO::it_commands>(m);
   init_ref_iterator<LIEF::MachO::it_symbols>(m);

doc/sphinx/api/cpp/macho.rst

@@ -13,6 +13,14 @@ Parsers
 
 ----------
 
+FatBinary
+*********
+
+.. doxygenclass:: LIEF::MachO::FatBinary
+   :project: lief
+
+----------
+
 Binary
 ******
 

doc/sphinx/api/python/macho.rst

@@ -10,6 +10,17 @@ Parser
 
 ----------
 
+FatBinary
+*********
+
+.. autoclass:: lief.MachO.FatBinary
+  :members:
+  :inherited-members:
+  :undoc-members:
+
+----------
+
+
 .. _python-macho-binary-api-ref:
 
 Binary