gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Fixed possible off-by-one loops

Browse Source 
Due to variable size definitions in the structure, the 'for' loops may
actually try to work on wrong data. Instead of using hard-coded value,
we now simply let the compiler give us the number of elements.

This may (or may not) fix a crash reported by Rodolfo kix Garcia.
This commit is contained in:
Christophe CURIS
2012-05-31 20:26:09 +02:00
committed by Carlos R. Mafra
parent d356baebea
commit e498a8bd79
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/winspector.c
View File

@@ -884,7 +884,7 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
wWindowSetupInitialAttributes(wwin, &level, &workspace); wWindowSetupInitialAttributes(wwin, &level, &workspace);
for (i = 0; i < 11; i++) { for (i = 0; i < (sizeof(panel->attrChk) / sizeof(panel->attrChk[0])); i++) {
int flag = 0; int flag = 0;
switch (i) { switch (i) {
@@ -924,7 +924,7 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
} }
WMSetButtonSelected(panel->attrChk[i], flag); WMSetButtonSelected(panel->attrChk[i], flag);
} }
for (i = 0; i < 12; i++) { for (i = 0; i < (sizeof(panel->moreChk) / sizeof(panel->moreChk[0])); i++) {
int flag = 0; int flag = 0;
switch (i) { switch (i) {
@@ -970,7 +970,7 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
WMSetButtonSelected(panel->moreChk[i], flag); WMSetButtonSelected(panel->moreChk[i], flag);
} }
if (panel->appFrm && wapp) { if (panel->appFrm && wapp) {
for (i = 0; i < 3; i++) { for (i = 0; i < (sizeof(panel->appChk) / sizeof(panel->appChk[0])); i++) {
int flag = 0; int flag = 0;
switch (i) { switch (i) {
@@ -1252,7 +1252,7 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
WMMoveWidget(panel->attrFrm, 15, 45); WMMoveWidget(panel->attrFrm, 15, 45);
WMResizeWidget(panel->attrFrm, frame_width, 250); WMResizeWidget(panel->attrFrm, frame_width, 250);
for (i = 0; i < 11; i++) { for (i = 0; i < (sizeof(panel->attrChk) / sizeof(panel->attrChk[0])); i++) {
char *caption = NULL; char *caption = NULL;
int flag = 0; int flag = 0;
char *descr = NULL; char *descr = NULL;
@@ -1334,13 +1334,7 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
WMMoveWidget(panel->moreFrm, 15, 45); WMMoveWidget(panel->moreFrm, 15, 45);
WMResizeWidget(panel->moreFrm, frame_width, 265); WMResizeWidget(panel->moreFrm, frame_width, 265);
for (i = 0; for (i = 0; i < (sizeof(panel->moreChk) / sizeof(panel->moreChk[0])); i++) {
#ifdef XKB_BUTTON_HINT
i < 12;
#else
i < 11;
#endif
i++) {
char *caption = NULL; char *caption = NULL;
int flag = 0; int flag = 0;
char *descr = NULL; char *descr = NULL;
@@ -1506,7 +1500,7 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
WMMoveWidget(panel->appFrm, 15, 50); WMMoveWidget(panel->appFrm, 15, 50);
WMResizeWidget(panel->appFrm, frame_width, 240); WMResizeWidget(panel->appFrm, frame_width, 240);
for (i = 0; i < 3; i++) { for (i = 0; i < (sizeof(panel->appChk) / sizeof(panel->appChk[0])); i++) {
char *caption = NULL; char *caption = NULL;
int flag = 0; int flag = 0;
char *descr = NULL; char *descr = NULL;