From 22aeafd58547ff33d3f278d47a900e5e6f25e963 Mon Sep 17 00:00:00 2001
From: Vasilii Rogin <vasya@rogin.ru>
Date: Mon, 15 May 2023 18:03:45 +0300
Subject: [PATCH] Fix max string size for arrays

---
 src/sfall_arrays.cc | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sfall_arrays.cc b/src/sfall_arrays.cc
index 43a0007..54c07f3 100644
--- a/src/sfall_arrays.cc
+++ b/src/sfall_arrays.cc
@@ -74,6 +74,18 @@ private:
         void* pointerValue;
     };
 
+    void init_from_string(const char* str, int sLen)
+    {
+        type = ArrayElementType::STRING;
+
+        if (sLen == -1) sLen = strlen(str);
+        if (sLen >= ARRAY_MAX_STRING) sLen = ARRAY_MAX_STRING - 1; // memory safety
+
+        stringValue = (char*)malloc(sLen + 1);
+        memcpy(stringValue, str, sLen);
+        stringValue[sLen] = '\0';
+    }
+
 public:
     ArrayElement()
         : type(ArrayElementType::INT)
@@ -146,23 +158,19 @@ public:
             break;
         case VALUE_TYPE_STRING:
         case VALUE_TYPE_DYNAMIC_STRING:
-            type = ArrayElementType::STRING;
             auto str = programGetString(program, programValue.opcode, programValue.integerValue);
-            auto len = strlen(str);
-            auto buf = (char*)malloc(len + 1);
-            strcpy(buf, str);
-            stringValue = buf;
+            init_from_string(str, -1);
             break;
         }
     }
 
-    ArrayElement(char* str)
+    ArrayElement(const char* str)
     {
-        type = ArrayElementType::STRING;
-        auto len = strlen(str);
-        auto buf = (char*)malloc(len + 1);
-        strcpy(buf, str);
-        stringValue = buf;
+        init_from_string(str, -1);
+    }
+    ArrayElement(const char* str, int sLen)
+    {
+        init_from_string(str, sLen);
     }
 
     ProgramValue toValue(Program* program) const
@@ -634,9 +642,7 @@ ArrayId StringSplit(const char* str, const char* split)
 
         arr->ResizeArray(count);
         for (int i = 0; i < count; i++) {
-            char buf[2] = { 0 };
-            buf[0] = str[i];
-            arr->SetArray(ProgramValue { i }, ArrayElement { buf }, false);
+            arr->SetArray(ProgramValue { i }, ArrayElement { &str[i], 1 }, false);
         }
     } else {
         int count = 1;
@@ -651,23 +657,17 @@ ArrayId StringSplit(const char* str, const char* split)
 
         ptr = str;
         count = 0;
-        auto buf = (char*)malloc(strlen(str) + 1);
         while (true) {
             newptr = strstr(ptr, split);
             int len = (newptr) ? newptr - ptr : strlen(ptr);
 
-            memcpy(buf, ptr, len);
-            buf[len] = 0;
-
-            arr->SetArray(ProgramValue { count }, ArrayElement { buf }, false);
-            count++;
+            arr->SetArray(ProgramValue { count++ }, ArrayElement { ptr, len }, false);
 
             if (!newptr) {
                 break;
             }
             ptr = newptr + splitLen;
         }
-        free(buf);
     }
     return array_id;
 }