TextSubtext fixes (#4759)

Fix buffer write overflow
Fix reading past the end of text
This commit is contained in:
veins1 2025-02-13 03:12:10 +05:00 committed by GitHub
parent a1de60f3ba
commit 1d87932d93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1540,21 +1540,21 @@ const char *TextSubtext(const char *text, int position, int length)
if (position >= textLength)
{
position = textLength - 1;
length = 0;
return buffer; //First char is already '\0' by memset
}
if (length >= textLength) length = textLength;
int maxLength = textLength - position;
if (length > maxLength) length = maxLength;
if (length >= MAX_TEXT_BUFFER_LENGTH) length = MAX_TEXT_BUFFER_LENGTH - 1;
// NOTE: Alternative: memcpy(buffer, text + position, length)
for (int c = 0 ; c < length ; c++)
{
*(buffer + c) = *(text + position);
text++;
buffer[c] = text[position + c];
}
*(buffer + length) = '\0';
buffer[length] = '\0';
return buffer;
}