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

Merge pull request #1825 from ts-korhonen/master

Browse Source 
Fix resource string over bounds issues
This commit is contained in:
Miran Grča
2021-11-17 23:02:42 +01:00
committed by GitHub
parent f6741b172e 9b0a052447
commit adcd41cb80
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/win/win.c
View File

@@ -60,7 +60,7 @@
#endif #endif
typedef struct { typedef struct {
WCHAR str[512]; WCHAR str[1024];
} rc_str_t; } rc_str_t;
@@ -165,50 +165,50 @@ LoadCommonStrings(void)
free_string(&lpRCstr4096); free_string(&lpRCstr4096);
free_string(&lpRCstr2048); free_string(&lpRCstr2048);
lpRCstr2048 = (rc_str_t *)malloc(STR_NUM_2048*sizeof(rc_str_t)); lpRCstr2048 = calloc(STR_NUM_2048, sizeof(rc_str_t));
lpRCstr4096 = (rc_str_t *)malloc(STR_NUM_4096*sizeof(rc_str_t)); lpRCstr4096 = calloc(STR_NUM_4096, sizeof(rc_str_t));
lpRCstr4352 = (rc_str_t *)malloc(STR_NUM_4352*sizeof(rc_str_t)); lpRCstr4352 = calloc(STR_NUM_4352, sizeof(rc_str_t));
lpRCstr4608 = (rc_str_t *)malloc(STR_NUM_4608*sizeof(rc_str_t)); lpRCstr4608 = calloc(STR_NUM_4608, sizeof(rc_str_t));
lpRCstr5120 = (rc_str_t *)malloc(STR_NUM_5120*sizeof(rc_str_t)); lpRCstr5120 = calloc(STR_NUM_5120, sizeof(rc_str_t));
lpRCstr5376 = (rc_str_t *)malloc(STR_NUM_5376*sizeof(rc_str_t)); lpRCstr5376 = calloc(STR_NUM_5376, sizeof(rc_str_t));
lpRCstr5632 = (rc_str_t *)malloc(STR_NUM_5632*sizeof(rc_str_t)); lpRCstr5632 = calloc(STR_NUM_5632, sizeof(rc_str_t));
lpRCstr5888 = (rc_str_t *)malloc(STR_NUM_5888*sizeof(rc_str_t)); lpRCstr5888 = calloc(STR_NUM_5888, sizeof(rc_str_t));
lpRCstr6144 = (rc_str_t *)malloc(STR_NUM_6144*sizeof(rc_str_t)); lpRCstr6144 = calloc(STR_NUM_6144, sizeof(rc_str_t));
lpRCstr7168 = (rc_str_t *)malloc(STR_NUM_7168*sizeof(rc_str_t)); lpRCstr7168 = calloc(STR_NUM_7168, sizeof(rc_str_t));
for (i=0; i<STR_NUM_2048; i++) for (i=0; i<STR_NUM_2048; i++)
LoadString(hinstance, 2048+i, lpRCstr2048[i].str, 512); LoadString(hinstance, 2048+i, lpRCstr2048[i].str, 1024);
for (i=0; i<STR_NUM_4096; i++) for (i=0; i<STR_NUM_4096; i++)
LoadString(hinstance, 4096+i, lpRCstr4096[i].str, 512); LoadString(hinstance, 4096+i, lpRCstr4096[i].str, 1024);
for (i=0; i<STR_NUM_4352; i++) for (i=0; i<STR_NUM_4352; i++)
LoadString(hinstance, 4352+i, lpRCstr4352[i].str, 512); LoadString(hinstance, 4352+i, lpRCstr4352[i].str, 1024);
for (i=0; i<STR_NUM_4608; i++) for (i=0; i<STR_NUM_4608; i++)
LoadString(hinstance, 4608+i, lpRCstr4608[i].str, 512); LoadString(hinstance, 4608+i, lpRCstr4608[i].str, 1024);
for (i=0; i<STR_NUM_5120; i++) for (i=0; i<STR_NUM_5120; i++)
LoadString(hinstance, 5120+i, lpRCstr5120[i].str, 512); LoadString(hinstance, 5120+i, lpRCstr5120[i].str, 1024);
for (i=0; i<STR_NUM_5376; i++) { for (i=0; i<STR_NUM_5376; i++) {
if ((i == 0) || (i > 3)) if ((i == 0) || (i > 3))
LoadString(hinstance, 5376+i, lpRCstr5376[i].str, 512); LoadString(hinstance, 5376+i, lpRCstr5376[i].str, 1024);
} }
for (i=0; i<STR_NUM_5632; i++) { for (i=0; i<STR_NUM_5632; i++) {
if ((i == 0) || (i > 3)) if ((i == 0) || (i > 3))
LoadString(hinstance, 5632+i, lpRCstr5632[i].str, 512); LoadString(hinstance, 5632+i, lpRCstr5632[i].str, 1024);
} }
for (i=0; i<STR_NUM_5888; i++) for (i=0; i<STR_NUM_5888; i++)
LoadString(hinstance, 5888+i, lpRCstr5888[i].str, 512); LoadString(hinstance, 5888+i, lpRCstr5888[i].str, 1024);
for (i=0; i<STR_NUM_6144; i++) for (i=0; i<STR_NUM_6144; i++)
LoadString(hinstance, 6144+i, lpRCstr6144[i].str, 512); LoadString(hinstance, 6144+i, lpRCstr6144[i].str, 1024);
for (i=0; i<STR_NUM_7168; i++) for (i=0; i<STR_NUM_7168; i++)
LoadString(hinstance, 7168+i, lpRCstr7168[i].str, 512); LoadString(hinstance, 7168+i, lpRCstr7168[i].str, 1024);
} }