From f8a44c023f563f2adc511356a1e7865a20b9ab7b Mon Sep 17 00:00:00 2001
From: RomanDonw <romandonw628@gmail.com>
Date: Mon, 3 Aug 2026 18:25:44 +1000
Subject: [PATCH] patched code after code review from MihailRis

---
 res/modules/internal/bytearray.lua            | 37 +++++++++----------
 .../lua/usertypes/lua_type_canvas.cpp         |  7 +++-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/res/modules/internal/bytearray.lua b/res/modules/internal/bytearray.lua
index 04212d3e1..1615d1a08 100644
--- a/res/modules/internal/bytearray.lua
+++ b/res/modules/internal/bytearray.lua
@@ -4,13 +4,14 @@ local FFI = ffi
 
 FFI.cdef[[
     void* malloc(size_t);
-    void *realloc(void *, size_t);
+    void* realloc(void*, size_t);
     void free(void*);
     typedef struct {
         unsigned char* bytes;
         int size;
         int capacity;
     } bytearray_t;
+    void* memmove(void*, const void*, size_t);
 ]]
 
 local free = FFI.C.free
@@ -172,29 +173,27 @@ local function slice(self, offset, length)
 end
 
 local function copy(self, srcindex, dst, dstindex, size)
-    if srcindex > 0 and dstindex > 0 and size > 0 and
-        srcindex + size - 1 <= self.size and
-        dstindex + size - 1 <= dst.size
-    then
-        FFI.copy(dst.bytes + dstindex - 1, self.bytes + srcindex - 1, size)
+    if size <= 0 then error("size of byte range must be positive non-zero integer") end
+    if srcindex < 1 or srcindex + size - 1 > self.size then
+        error("specified source byte range is out of source array bounds")
     end
+    if dstindex < 1 or dstindex + size - 1 > dst.size then
+        error("specified destination byte range is out of destination array bounds")
+    end
+
+    FFI.copy(dst.bytes + dstindex - 1, self.bytes + srcindex - 1, size)
 end
 
 local function move(self, fromindex, toindex, size)
-    if fromindex > 0 and toindex > 0 and size > 0 and
-        fromindex + size - 1 <= self.size and
-        toindex + size - 1 <= self.size
-    then
-        if toindex >= fromindex and toindex < fromindex + size then
-            local buff = malloc(size)
-            FFI.copy(buff, self.bytes + fromindex - 1, size)
-            FFI.copy(self.bytes + toindex - 1, buff, size)
-            free(buff)
-        else
-            -- убери(-те) это ветвление, если FFI будет производить копирование не побайтово, и оставь(-те) только верхний блок без условия вообще.
-            FFI.copy(self.bytes + toindex - 1, self.bytes + fromindex - 1, size)
-        end
+    if size <= 0 then error("size of byte range must be positive non-zero integer") end
+    if fromindex < 1 or fromindex + size - 1 > self.size then
+        error("specified source byte range is out of array bounds")
     end
+    if toindex < 1 or toindex + size - 1 > self.size then
+        error("specified destination byte range is out of array bounds")
+    end
+
+    FFI.C.memmove(self.bytes + self.toindex - 1, self.bytes + self.fromindex - 1, size)
 end
 
 local bytearray_methods = {
diff --git a/src/logic/scripting/lua/usertypes/lua_type_canvas.cpp b/src/logic/scripting/lua/usertypes/lua_type_canvas.cpp
index d03b4e855..928515e74 100644
--- a/src/logic/scripting/lua/usertypes/lua_type_canvas.cpp
+++ b/src/logic/scripting/lua/usertypes/lua_type_canvas.cpp
@@ -164,8 +164,11 @@ static int l_clear(State* L) {
     size_t pixelscount = image.getWidth() * image.getHeight();
     uint32_t* data = reinterpret_cast<uint32_t*>(image.getData());
 
-    if (gettop(L) == 1) std::fill(data, data + pixelscount, 0);
-    else std::fill(data, data + pixelscount, get_rgba(L, 2).rgba);
+    if (gettop(L) == 1) {
+        std::fill(data, data + pixelscount, 0);
+    } else {
+        std::fill(data, data + pixelscount, get_rgba(L, 2).rgba);
+    }
     return 0;
 }