Fix several memory leak/uaf issues

Author: MetsukiMio

include/openminecraft/io/om_io_parser.hpp

@@ -9,13 +9,13 @@ namespace openminecraft::io
 class OMParser
 {
   public:
-    OMParser(std::shared_ptr<std::istream> stream);
+    OMParser(std::istream *stream);
     ~OMParser();
     bool check();
 
   protected:
-    std::shared_ptr<std::istream> source;
+    std::istream *source;
 };
 } // namespace openminecraft::io
 
-#endif
+#endif

include/openminecraft/vm/classfile/om_class_file.hpp

@@ -711,7 +711,7 @@ class OMClassFileParser : public io::OMParser
     using ConstantMapping = std::unordered_map<uint16_t, std::shared_ptr<OMClassConstant>>;
 
   public:
-    OMClassFileParser(std::shared_ptr<std::istream> stream);
+    OMClassFileParser(std::istream *stream);
     ~OMClassFileParser();
     util::OMResult<std::shared_ptr<OMClassFile>, err::OMValidationError> parse();
     ConstantMapping buildConstantMapping(std::vector<std::shared_ptr<OMClassConstant>> c);

include/openminecraft/vm/pixeltower/om_pixeltower.hpp

@@ -21,7 +21,7 @@ class OMPixelTower
     ~OMPixelTower();
 
     void loadClass(std::shared_ptr<classfile::OMClassFile> file);
-    void loadClass(std::shared_ptr<std::istream> file);
+    void loadClass(std::istream *file);
     std::shared_ptr<OMClass> fetchClass(std::string name);
 
     void execute(std::string clazz, std::string name, std::string desc);
@@ -45,4 +45,4 @@ class OMPixelTower
 };
 } // namespace openminecraft::vm::pixeltower
 
-#endif
+#endif

src/boot/entrypoint.cpp

@@ -180,7 +180,9 @@ int boot(std::vector<std::string> args)
                                         0;
                                 }
                             });
-                            pt->loadClass(std::make_shared<std::ifstream>(commandBuffer[2], std::ios::binary));
+                            auto stti = new std::ifstream(commandBuffer[2], std::ios::binary);
+                            pt->loadClass(stti);
+			    delete stti;
 
                             auto cls = pt->fetchClass("java/lang/String");
                             void *arr = pt->allocateArray(cls, 2);
@@ -216,7 +218,9 @@ int boot(std::vector<std::string> args)
                         searchDir(m, std::filesystem::directory_iterator(commandBuffer[2]));
                         for (auto a : m)
                         {
-                            pt->loadClass(std::make_shared<std::ifstream>(a, std::ios::binary));
+                            auto stt = new std::ifstream(a, std::ios::binary);
+			    pt->loadClass(stt);
+			    delete stt;
                         }
 
                         auto cmdPrint = [&](std::any data) {

src/i18n/om_i18n_res.cpp

@@ -4,6 +4,7 @@
 #include "nlohmann/json_fwd.hpp"
 #include "openminecraft/log/om_log_common.hpp"
 #include "openminecraft/vfs/om_vfs_base.hpp"
+#include "openminecraft/mem/om_mem_allocator.hpp"
 #include <SDL3/SDL_locale.h>
 #include <algorithm>
 #include <cctype>
@@ -47,6 +48,7 @@ void load()
         std::transform(c.begin(), c.end(), c.begin(), ::tolower);
         locale = fmt::format("{}_{}", loc[0]->language, c);
     }
+    mem::allocator::tracedFreeSDL(loc);
 
     records.clear();
     translates.clear();
@@ -117,4 +119,4 @@ std::string translate(std::string key)
     }
     return key;
 }
-} // namespace openminecraft::i18n::res
+} // namespace openminecraft::i18n::res

src/io/om_io_parser.cpp

@@ -2,7 +2,7 @@
 
 namespace openminecraft::io
 {
-OMParser::OMParser(std::shared_ptr<std::istream> stream) : source(stream)
+OMParser::OMParser(std::istream *stream) : source(stream)
 {
 }
 OMParser::~OMParser()
@@ -12,4 +12,4 @@ bool OMParser::check()
 {
     return source->good();
 }
-} // namespace openminecraft::io
+} // namespace openminecraft::io

src/mem/om_mem_allocator.cpp

@@ -69,4 +69,16 @@ void operator delete[](void *p) noexcept
 {
     rec({Free, p, heapSize(p), OM_MEM_CPP});
     free(p);
-}
+}
+
+void operator delete(void *p, size_t l) noexcept
+{
+    rec({Free, p, l, OM_MEM_CPP});
+    free(p);
+}
+
+void operator delete[](void *p, size_t l) noexcept
+{
+    rec({Free, p, l, OM_MEM_CPP});
+    free(p);
+}

src/vm/classfile/om_class_file.cpp

@@ -14,7 +14,7 @@ using namespace openminecraft::util;
 
 namespace openminecraft::vm::classfile
 {
-OMClassFileParser::OMClassFileParser(std::shared_ptr<std::istream> str) : io::OMParser(str)
+OMClassFileParser::OMClassFileParser(std::istream *str) : io::OMParser(str)
 {
     this->logger = std::make_shared<log::OMLogger>("OMClassFileParser", this);
 }

src/vm/pixeltower/v0/om_pixeltower.cpp

@@ -74,7 +74,7 @@ void OMPixelTower::loadClass(std::shared_ptr<classfile::OMClassFile> file)
 
     classloader->appendStagingClass(file);
 }
-void OMPixelTower::loadClass(std::shared_ptr<std::istream> file)
+void OMPixelTower::loadClass(std::istream *file)
 {
     auto parser = std::make_shared<classfile::OMClassFileParser>(file);
     auto clsres = parser->parse();
@@ -118,4 +118,4 @@ void *OMPixelTower::allocateMultiArray(OMArrayType type, int *lengths, int dim)
 {
     return mm->allocateArray(type, lengths, dim);
 }
-} // namespace openminecraft::vm::pixeltower
+} // namespace openminecraft::vm::pixeltower

src/vm/pixeltower/v0/om_pixeltower_interpreter.cpp

@@ -182,6 +182,7 @@ void OMInterpreter::execute(std::shared_ptr<OMClass> clazz, std::shared_ptr<OMMe
         while (frame->offset < mi->code->codeLength)
         {
             operands++;
+            tower.mm->gc();
             switch (codeArea[frame->offset])
             {
             case op_nop: {