fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix possible seg fault in ffStrbufAppendVF

Browse Source
This commit is contained in:
Linus Dierheimer
2021-11-17 11:41:17 +01:00
parent 7ced537e59
commit 7db781c508
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/FFstrbuf.c
+9 -14
View File
@@ -289,23 +289,17 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments)
if(format == NULL)
return;
va_list localArguments;
va_copy(localArguments, arguments);
uint32_t free = ffStrbufGetFree(strbuf);
uint32_t written = (uint32_t) vsnprintf(strbuf->chars + strbuf->length, free, format, arguments);
uint32_t written = (uint32_t) vsnprintf(strbuf->chars + strbuf->length, strbuf->allocated - strbuf->length - 1, format, localArguments); // -1 for the null byte
va_end(localArguments);
if(strbuf->length + written >= strbuf->allocated - 1) // -1 for the null byte
if(strbuf->length + written > free)
{
setCapacity(strbuf, strbuf->allocated * 2);
ffStrbufAppendVF(strbuf, format, arguments); //Try again with larger buffer
}
else
{
strbuf->length += written;
strbuf->chars[strbuf->length] = '\0';
ffStrbufEnsureFree(strbuf, written);
written = (uint32_t) vsnprintf(strbuf->chars + strbuf->length, ffStrbufGetFree(strbuf), format, arguments);
}
strbuf->length += written;
strbuf->chars[strbuf->length] = '\0';
}
char ffStrbufGetC(FFstrbuf* strbuf, uint32_t index)
@@ -665,4 +659,5 @@ void ffStrbufRecalculateLength(FFstrbuf* strbuf)
void ffStrbufDestroy(FFstrbuf* strbuf)
{
free(strbuf->chars);
strbuf->allocated = 0;
}