nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

static analyzer bits for bones.c

Browse Source 
src/bones.c(646): warning: Using uninitialized memory 'oldbonesid'.
src/bones.c(646): warning: String 'oldbonesid' might not be zero-terminated.

Also help prevent a buffer overflow on corrupt or ill-formed bones.
This commit is contained in:
nhmall
2023-12-27 10:49:21 -05:00
parent 80afc96def
commit e138f497ff
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bones.c
View File

@@ -598,7 +598,8 @@ getbones(void)
{ {
int ok; int ok;
NHFILE *nhfp = (NHFILE *) 0; NHFILE *nhfp = (NHFILE *) 0;
char c = 0, *bonesid, oldbonesid[40]; /* was [10]; more should be safer */ char c = 0, *bonesid,
oldbonesid[40] = { 0 }; /* was [10]; more should be safer */
if (discover) /* save bones files for real games */ if (discover) /* save bones files for real games */
return 0; return 0;
@@ -640,8 +641,18 @@ getbones(void)
string and wasn't recorded in the file */ string and wasn't recorded in the file */
mread(nhfp->fd, (genericptr_t) &c, mread(nhfp->fd, (genericptr_t) &c,
sizeof c); /* length including terminating '\0' */ sizeof c); /* length including terminating '\0' */
mread(nhfp->fd, (genericptr_t) oldbonesid, if ((unsigned) c <= sizeof oldbonesid) {
(unsigned) c); /* DD.nn or Qrrr.n for role rrr */ mread(nhfp->fd, (genericptr_t) oldbonesid,
(unsigned) c); /* DD.nn or Qrrr.n for role rrr */
} else {
if (wizard)
debugpline2("Abandoning bones , %u > %u.",
(unsigned) c, (unsigned) sizeof oldbonesid);
close_nhfile(nhfp);
compress_bonesfile();
/* ToDo: maybe unlink these problematic bones? */
return 0;
}
} }
if (strcmp(bonesid, oldbonesid) != 0) { if (strcmp(bonesid, oldbonesid) != 0) {
char errbuf[BUFSZ]; char errbuf[BUFSZ];