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

Windows: fix potential memory curruption bug in unicode.c

Browse Source 
Also add ffStrbufInitWS
This commit is contained in:
李通洲
2023-05-27 22:28:40 +08:00
parent 77f7c813f4
commit 1ae0a83880
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -10,6 +10,7 @@ Bugfixes:
* Fix iTerm being detected as iTermServer-* sometimes
* Fix sound device volume being incorrectly detected as muted sometimes (Sound)
* Fix memleaks reported by LeakSanitizer (Linux)
* Fix potential memory curruption bug in unicode.c (Windows)
Logo:
* Update Windows 11 ASCII logo to look more visually consistent (#445)
src/util/windows/unicode.c
+9 -12
View File
@@ -17,20 +17,17 @@ void ffStrbufSetNWS(FFstrbuf* result, uint32_t length, const wchar_t* source)
result->chars[size_needed] = '\0';
}
FFstrbuf ffStrbufCreateNWS(uint32_t length, const wchar_t* source)
void ffStrbufInitNWS(FFstrbuf* result, uint32_t length, const wchar_t* source)
{
FFstrbuf result;
if(length == 0)
ffStrbufInit(&result);
else
if(!length)
{
int size_needed = WideCharToMultiByte(CP_UTF8, 0, source, (int)length, NULL, 0, NULL, NULL);
ffStrbufInitA(&result, (uint32_t)size_needed);
WideCharToMultiByte(CP_UTF8, 0, source, (int)length, result.chars, size_needed, NULL, NULL);
result.length = (uint32_t)size_needed;
result.chars[size_needed] = '\0';
ffStrbufInit(result);
return;
}
return result;
int size_needed = WideCharToMultiByte(CP_UTF8, 0, source, (int)length, NULL, 0, NULL, NULL);
ffStrbufInitA(result, (uint32_t)size_needed + 1);
WideCharToMultiByte(CP_UTF8, 0, source, (int)length, result->chars, size_needed, NULL, NULL);
result->length = (uint32_t)size_needed;
result->chars[size_needed] = '\0';
}
src/util/windows/unicode.h
+13 -1
View File
@@ -13,7 +13,19 @@ static inline void ffStrbufSetWS(FFstrbuf* result, const wchar_t* source)
return ffStrbufSetNWS(result, (uint32_t)wcslen(source), source);
}
FFstrbuf ffStrbufCreateNWS(uint32_t length, const wchar_t* source);
void ffStrbufInitNWS(FFstrbuf* result, uint32_t length, const wchar_t* source);
static inline void ffStrbufInitWS(FFstrbuf* result, const wchar_t* source)
{
return ffStrbufInitNWS(result, (uint32_t)wcslen(source), source);
}
static inline FFstrbuf ffStrbufCreateNWS(uint32_t length, const wchar_t* source)
{
FFstrbuf result;
ffStrbufInitNWS(&result, length, source);
return result;
}
static inline FFstrbuf ffStrbufCreateWS(const wchar_t* source)
{