Skip to content

[rtext] Fix and enhance TextReplace() function #5511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raysan5 merged 3 commits into from
Jan 26, 2026
+12 −12
Merged

[rtext] Fix and enhance TextReplace() function #5511

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20b42b9
add check for replacement,replace strcpy,strncpy with memcpy
ssszcmawo Jan 24, 2026
a21674e
add 4 spaces in if statement
ssszcmawo Jan 25, 2026
8c91bfd
add spaces
ssszcmawo Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/rtext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,14 +1727,15 @@ char *GetTextBetween(const char *text, const char *begin, const char *end)

// Replace text string
// REQUIRES: strstr(), strncpy()
// TODO: If (replacement == "") remove "search" text
// WARNING: Allocated memory must be manually freed
char *TextReplace(const char *text, const char *search, const char *replacement)
{
char *result = NULL;

if ((text != NULL) && (search != NULL))
{
{
if (replacement == NULL) replacement = "";

char *insertPoint = NULL; // Next insert point
char *temp = NULL; // Temp pointer
int textLen = 0; // Text string length
Expand Down Expand Up @@ -1767,16 +1768,15 @@ char *TextReplace(const char *text, const char *search, const char *replacement)
{
insertPoint = (char *)strstr(text, search);
lastReplacePos = (int)(insertPoint - text);

// TODO: Review logic to avoid strcpy()
// OK - Those lines work
temp = strncpy(temp, text, lastReplacePos) + lastReplacePos;
temp = strcpy(temp, replacement) + replaceLen;
// WRONG - But not those ones
//temp = strncpy(temp, text, tempLen - 1) + lastReplacePos;
//tempLen -= lastReplacePos;
//temp = strncpy(temp, replacement, tempLen - 1) + replaceLen;
//tempLen -= replaceLen;

memcpy(temp, text, lastReplacePos);
temp += lastReplacePos;

if (replaceLen > 0)
{
memcpy(temp, replacement, replaceLen);
temp += replaceLen;
}

text += lastReplacePos + searchLen; // Move to next "end of replace"
}
Expand Down
Loading