Skip to content

Specify field widths for scanf to prevent potential crashes. #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Quipyowert2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Specify field widths for scanf to prevent potential crashes. #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions contrib/curve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ get_input_num(char *name, int defaultval, int helpnum, int minval, int maxval, i

for (;;) {
printf("\nPlease enter %s (default = %d) -> ", name, defaultval);
scanf("%s", str);
scanf("%79s", str);

if (str[0] == 'x') return 1;

Expand All @@ -224,7 +224,7 @@ get_input_yn(char *question, char defval, int helpnum)

for (;;) {
printf("\n%s? (y/n/?) -> ", question);
scanf("%s", str);
scanf("%79s", str);

if (str[0] == '?') showhelp(helpnum);
else if (str[0] == 'y' || str[0] == 'n') return str[0];
Expand Down Expand Up @@ -384,7 +384,7 @@ void gettextures(void)
int huh;
for (i = 0; i<4; i++)
{
huh = fscanf(fp,"%s %s",c1,c2);
huh = fscanf(fp,"%255s %255s",c1,c2);
if (huh == 2)
{
if (strcmp(c1,"TOP") == 0) sprintf(toptex,"mtrl/%s",c2);
Expand Down Expand Up @@ -532,7 +532,7 @@ int main(int argc, char *argv[])
do {
okay=0;
printf("\nPlease enter filename for your curve -> ");
scanf("%s",str);
scanf("%79s",str);
if (str[0]=='?')
showhelp(16);
else
Expand Down
2 changes: 1 addition & 1 deletion putt/hole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static void hole_init_rc(const char *filename)
/* Read the list. */

while (fs_gets(buff, sizeof (buff), fin) &&
sscanf(buff, "%s %s %d %s",
sscanf(buff, "%255s %255s %d %255s",
hole_v[count].file,
hole_v[count].back,
&hole_v[count].par,
Expand Down
4 changes: 2 additions & 2 deletions share/mapc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ static void read_obj(struct s_base *fp, const char *name, int mi)
{
if (strncmp(line, "usemtl", 6) == 0)
{
sscanf(line + 6, "%s", mtrl);
sscanf(line + 6, "%255s", mtrl);
mi = read_mtrl(fp, mtrl);
}

Expand Down Expand Up @@ -989,7 +989,7 @@ static int map_token(fs_file fin, int pi, char key[MAXSTR], char val[MAXSTR])
"( %f %f %f ) "
"( %f %f %f ) "
"( %f %f %f ) "
"%s %f %f %f %f %f %d",
"%255s %f %f %f %f %f %d",
&x0, &y0, &z0,
&x1, &y1, &z1,
&x2, &y2, &z2,
Expand Down
2 changes: 1 addition & 1 deletion share/solid_base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ int mtrl_read(struct b_mtrl *mp, const char *name)

p += 6;

while (sscanf(p, "%s%n", word, &n) > 0)
while (sscanf(p, "%255s%n", word, &n) > 0)
{
for (i = 0; i < ARRAYSIZE(mtrl_flags); i++)
if (strcmp(word, mtrl_flags[i].name) == 0)
Expand Down