From 12746a968129d6d288c3a10338c9b25c4823d2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 26 Mar 2026 16:40:15 +0800 Subject: [PATCH] Global: fixes issues raised by AI --- scripts/gen-amdgpuids.py | 2 +- scripts/gen-pciids.py | 2 +- src/detection/font/font_windows.c | 3 +++ src/detection/terminalsize/terminalsize_windows.c | 2 +- src/logo/image/image.c | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/gen-amdgpuids.py b/scripts/gen-amdgpuids.py index 36292c845..d84c133c4 100755 --- a/scripts/gen-amdgpuids.py +++ b/scripts/gen-amdgpuids.py @@ -7,7 +7,7 @@ def main(amdgpu_ids_path: str): full_text = f.read() if full_text == '': - sys.exit('Error: pci.ids file is empty') + sys.exit(f'Error: {amdgpu_ids_path} file is empty') products = [] for line in full_text.split('\n'): diff --git a/scripts/gen-pciids.py b/scripts/gen-pciids.py index cb8cdc03b..94ee29728 100755 --- a/scripts/gen-pciids.py +++ b/scripts/gen-pciids.py @@ -19,7 +19,7 @@ def main(keep_vendor_list: set, pci_ids_path: str): full_text = f.read() if full_text == '': - sys.exit('Error: pci.ids file is empty') + sys.exit(f'Error: {pci_ids_path} file is empty') dev_list_text = full_text[:full_text.rfind('\n\n\n')] # remove known classes for line in dev_list_text.split('\n'): diff --git a/src/detection/font/font_windows.c b/src/detection/font/font_windows.c index acd6c3063..3075defaf 100644 --- a/src/detection/font/font_windows.c +++ b/src/detection/font/font_windows.c @@ -48,6 +48,9 @@ const char* ffDetectFontImpl(FFFontResult* result) for (uint32_t i = 0; i < ARRAY_SIZE(fonts); ++i) { + if (fontBuffers[i].length != sizeof(LOGFONTW)) + continue; // Invalid data, skip + LOGFONTW* logFont = &fonts[i]; ffStrbufSetWS(&result->fonts[i], logFont->lfFaceName); diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c index d5c2a2f8a..dfbde494b 100644 --- a/src/detection/terminalsize/terminalsize_windows.c +++ b/src/detection/terminalsize/terminalsize_windows.c @@ -33,7 +33,7 @@ bool ffDetectTerminalSize(FFTerminalSizeResult* result) return false; { - CONSOLE_FONT_INFOEX cfi; + CONSOLE_FONT_INFOEX cfi = { .cbSize = sizeof(cfi) }; if(GetCurrentConsoleFontEx(hOutput, FALSE, &cfi)) // Only works for ConHost { result->width = result->columns * (uint16_t) cfi.dwFontSize.X; diff --git a/src/logo/image/image.c b/src/logo/image/image.c index ef7ed7a75..17b4e1ed6 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -950,7 +950,7 @@ static bool getCharacterPixelDimensions(FFLogoRequestData* requestData) { #ifdef _WIN32 - CONSOLE_FONT_INFOEX cfi; + CONSOLE_FONT_INFOEX cfi = { .cbSize = sizeof(cfi) }; if(GetCurrentConsoleFontEx(GetStdHandle(STD_OUTPUT_HANDLE), FALSE, &cfi)) // Only works for ConHost { requestData->characterPixelWidth = cfi.dwFontSize.X;