Merge branch 'dev' of https://github.com/arozx/voxels into dev

arozx · Feb 22, 2025 · ba4353c · ba4353c
2 parents c6f941f + ce00f2b
commit ba4353c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/sandbox/assets/scripts/init.lua b/sandbox/assets/scripts/init.lua
@@ -8,7 +8,7 @@ engine.trace("Creating build directory: " .. buildDir)
 if not engine.exists(buildDir) then
     local success = engine.mkdir(buildDir)
     if not success then
-        engine.error(string.format("Failed to create directory" .. buildDir))
+        engine.error(string.format("Failed to create directory: %s", buildDir))
         return
     end
 end
@@ -49,6 +49,7 @@ local function copyScript(name)
     local dest, destErr = io.open(destPath, "wb")
     if not dest then
         engine.warn(string.format("Failed to create destination file" .. destPath .. ": " .. destErr))
+
         closeFiles(source)
         return false
     end

diff --git a/src/Core/FileSystem.h b/src/Core/FileSystem.h
@@ -15,13 +15,23 @@ namespace Engine {
             return std::filesystem::create_directory(sanitizedPath);
         }
         static bool WriteFile(const std::string& filepath, const std::string& content) {
+            constexpr size_t MAX_FILE_SIZE = 10 * 1024 * 1024;  // 10MB limit
+            if (content.size() > MAX_FILE_SIZE) {
+                LOG_ERROR("Content size exceeds limit: ", content.size(), " > ", MAX_FILE_SIZE);
+                return false;
+            }
             std::string path = SantizePath(filepath);
             std::ofstream file(path);
             if (!file.is_open()) {
-                LOG_ERROR("Failed to open file: ", path);
+                LOG_ERROR("Failed to open file '", path, "': ", std::strerror(errno));
                 return false;
             }
             file << content;
+            if (file.fail()) {
+                LOG_ERROR("Failed to write to file '", path, "': ", std::strerror(errno));
+                file.close();
+                return false;
+            }
             file.close();
             return true;
         }