80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix buffer lengths in swprintf calls

Browse Source
This commit is contained in:
David Hrdlička
2023-02-19 23:05:16 +01:00
parent f3abf2851f
commit b8bfaa9269
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/86box.c
View File

@@ -853,7 +853,7 @@ pc_init_modules(void)
/* Load the ROMs for the selected machine. */ /* Load the ROMs for the selected machine. */
if (!machine_available(machine)) { if (!machine_available(machine)) {
swprintf(temp, sizeof(temp), plat_get_string(IDS_2063), machine_getname()); swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2063), machine_getname());
c = 0; c = 0;
machine = -1; machine = -1;
while (machine_get_internal_name_ex(c) != NULL) { while (machine_get_internal_name_ex(c) != NULL) {
@@ -876,7 +876,7 @@ pc_init_modules(void)
if (!video_card_available(gfxcard[0])) { if (!video_card_available(gfxcard[0])) {
memset(tempc, 0, sizeof(tempc)); memset(tempc, 0, sizeof(tempc));
device_get_name(video_card_getdevice(gfxcard[0]), 0, tempc); device_get_name(video_card_getdevice(gfxcard[0]), 0, tempc);
swprintf(temp, sizeof(temp), plat_get_string(IDS_2064), tempc); swprintf(temp, sizeof_w(temp), plat_get_string(IDS_2064), tempc);
c = 0; c = 0;
while (video_get_internal_name(c) != NULL) { while (video_get_internal_name(c) != NULL) {
gfxcard[0] = -1; gfxcard[0] = -1;
@@ -898,7 +898,7 @@ pc_init_modules(void)
if (!video_card_available(gfxcard[1])) { if (!video_card_available(gfxcard[1])) {
char tempc[512] = { 0 }; char tempc[512] = { 0 };
device_get_name(video_card_getdevice(gfxcard[1]), 0, tempc); device_get_name(video_card_getdevice(gfxcard[1]), 0, tempc);
swprintf(temp, sizeof(temp), (wchar_t *) "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card.", tempc); swprintf(temp, sizeof_w(temp), (wchar_t *) "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card.", tempc);
ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp); ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp);
gfxcard[1] = 0; gfxcard[1] = 0;
} }

6
src/win/win_about.c
View File

@@ -43,9 +43,9 @@ AboutDialogCreate(HWND hwnd)
}; };
wchar_t emu_version[256]; wchar_t emu_version[256];
i = swprintf(emu_version, sizeof(emu_version), L"%ls v%ls", EMU_NAME_W, EMU_VERSION_FULL_W); i = swprintf(emu_version, sizeof_w(emu_version), L"%ls v%ls", EMU_NAME_W, EMU_VERSION_FULL_W);
#ifdef EMU_GIT_HASH #ifdef EMU_GIT_HASH
i += swprintf(&emu_version[i], sizeof(emu_version) - i, L" [%ls]", EMU_GIT_HASH_W); i += swprintf(&emu_version[i], sizeof_w(emu_version) - i, L" [%ls]", EMU_GIT_HASH_W);
#endif #endif
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) #if defined(__arm__) || defined(__TARGET_ARCH_ARM)
@@ -59,7 +59,7 @@ AboutDialogCreate(HWND hwnd)
#else #else
# define ARCH_STR L"unknown" # define ARCH_STR L"unknown"
#endif #endif
swprintf(&emu_version[i], sizeof(emu_version) - i, L" [%ls, %ls]", ARCH_STR, plat_get_string(IDS_DYNAREC)); swprintf(&emu_version[i], sizeof_w(emu_version) - i, L" [%ls, %ls]", ARCH_STR, plat_get_string(IDS_DYNAREC));
tdconfig.cbSize = sizeof(tdconfig); tdconfig.cbSize = sizeof(tdconfig);
tdconfig.hwndParent = hwnd; tdconfig.hwndParent = hwnd;