eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix max string size for arrays

This commit is contained in:
Vasilii Rogin 2023-05-15 18:03:45 +03:00
parent b24f607133
commit 22aeafd585
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/sfall_arrays.cc
View File

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