Skip to content

Fix infinite loop in replaceStringInfoString #1750

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

Open
Smyatkin-Maxim wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −7
Open

Fix infinite loop in replaceStringInfoString #1750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions src/common/stringinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,32 @@ enlargeStringInfo(StringInfo str, int needed)
void
replaceStringInfoString(StringInfo str, char *replace, char *replacement)
{
char *ptr;
char *match_ptr = NULL;
char *start_ptr = str->data;
char *dup = NULL;
size_t replace_len = strlen(replace);

while ((ptr = strstr(str->data, replace)) != NULL)
{
char *dup = pstrdup(str->data);
// prevent empty loop, cuz strstr will always return start_ptr
Copy link
Copy Markdown
Contributor

@reshke reshke May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cuz -> because

if (replace_len == 0)
return;

resetStringInfo(str);
appendBinaryStringInfo(str, dup, ptr - str->data);
while ((match_ptr = strstr(start_ptr, replace)) != NULL)
{
if (dup == NULL)
{
dup = pstrdup(str->data);
start_ptr = dup;
match_ptr = dup + (match_ptr - str->data);
resetStringInfo(str);
}

appendBinaryStringInfo(str, start_ptr, match_ptr - start_ptr);
appendStringInfoString(str, replacement);
appendStringInfoString(str, dup + (ptr - str->data) + strlen(replace));
start_ptr = match_ptr + replace_len;
}
if (dup != NULL)
{
appendStringInfoString(str, start_ptr);
pfree(dup);
}
}
Loading