snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmgeneral: Use field width limits for scanf.

Browse source 
This fixes "(portability) scanf without field width limits can crash with
huge input data on some versions of libc" warning from cppcheck.

We choose 10 as the field width limit as it is the number of characters in
2^31-1, the largest int.
This commit is contained in:
Doug Torrance 2015-05-19 22:30:51 -05:00 committed by Carlos R. Mafra
parent a0f16b945a
commit 6b1ed40882
12 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wmSMPmon/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmckgmail/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmcpufreq/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmfsm/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmifs/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmitime/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmkeys/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmmon/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmppp.app/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmsm.app/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmtime/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }

4
wmtz/wmgeneral/wmgeneral.c
View file

@ -306,7 +306,7 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
int zero=0; int zero=0;
int curpixel; int curpixel;
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth); sscanf(*xpm, "%10d %10d %10d %10d", &width, &height, &numcol, &depth);
for (k=0; k!=depth; k++) for (k=0; k!=depth; k++)
@ -483,7 +483,7 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
XMapWindow(display, win); XMapWindow(display, win);
if (geometry) { if (geometry) {
if (sscanf(geometry, "+%d+%d", &wx, &wy) != 2) { if (sscanf(geometry, "+%10d+%10d", &wx, &wy) != 2) {
fprintf(stderr, "Bad geometry string.\n"); fprintf(stderr, "Bad geometry string.\n");
exit(1); exit(1);
} }