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

file descriptor leak reported by analyzer

Browse Source
This commit is contained in:
nhmall
2025-05-30 09:46:19 -04:00
parent 9ed1e6201a
commit 8a2b8796cd
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/files.c
View File

@@ -506,6 +506,8 @@ close_nhfile(NHFILE *nhfp)
{ {
if (nhfp->structlevel && nhfp->fd != -1) if (nhfp->structlevel && nhfp->fd != -1)
(void) nhclose(nhfp->fd), nhfp->fd = -1; (void) nhclose(nhfp->fd), nhfp->fd = -1;
else if (nhfp->fpdef)
(void) fclose(nhfp->fpdef), nhfp->fpdef = (FILE *) 0;
if (nhfp->fplog) if (nhfp->fplog)
(void) fprintf(nhfp->fplog, "# closing\n"); (void) fprintf(nhfp->fplog, "# closing\n");
if (nhfp->fplog) if (nhfp->fplog)
@@ -847,6 +849,7 @@ create_bonesfile(d_level *lev, char **bonesid, char errbuf[])
failed = errno; failed = errno;
} }
if (nhfp->structlevel) { if (nhfp->structlevel) {
#ifndef UNIX
#if defined(MICRO) || defined(WIN32) #if defined(MICRO) || defined(WIN32)
/* Use O_TRUNC to force the file to be shortened if it already /* Use O_TRUNC to force the file to be shortened if it already
* exists and is currently longer. * exists and is currently longer.
@@ -854,12 +857,14 @@ create_bonesfile(d_level *lev, char **bonesid, char errbuf[])
nhfp->fd = open(file, nhfp->fd = open(file,
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, FCMASK); O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, FCMASK);
#else #else
/* implies UNIX or MAC (MAC is for OS9 or earlier) */
#ifdef MAC #ifdef MAC
nhfp->fd = maccreat(file, BONE_TYPE); nhfp->fd = maccreat(file, BONE_TYPE);
#else #else
nhfp->fd = creat(file, FCMASK); nhfp->fd = creat(file, FCMASK);
#endif #endif /* ?MAC */
#endif #endif /* ?MICRO || WIN32 */
#endif /* UNIX */
if (nhfp->fd < 0) if (nhfp->fd < 0)
failed = errno; failed = errno;
#if defined(MSDOS) #if defined(MSDOS)
@@ -1145,21 +1150,24 @@ create_savefile(void)
#ifdef SAVEFILE_DEBUGGING #ifdef SAVEFILE_DEBUGGING
nhfp->fplog = fopen("create-savefile.log", "w"); nhfp->fplog = fopen("create-savefile.log", "w");
#endif #endif
} #ifndef UNIX
#if defined(MICRO) || defined(WIN32) #if defined(MICRO) || defined(WIN32)
nhfp->fd = open(fq_save, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, nhfp->fd = open(fq_save, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC,
FCMASK); FCMASK);
#else #else /* !MICRO && !WIN32 */
/* UNIX || MAC implied (MAC is OS9 or earlier only) */
#ifdef MAC #ifdef MAC
nhfp->fd = maccreat(fq_save, SAVE_TYPE); nhfp->fd = maccreat(fq_save, SAVE_TYPE);
#else #else
nhfp->fd = creat(fq_save, FCMASK); nhfp->fd = creat(fq_save, FCMASK);
#endif #endif
#endif /* MICRO || WIN32 */ #endif /* MICRO || WIN32 */
}
#if defined(MSDOS) || defined(WIN32) #if defined(MSDOS) || defined(WIN32)
if (nhfp->fd >= 0) if (nhfp->fd >= 0)
(void) setmode(nhfp->fd, O_BINARY); (void) setmode(nhfp->fd, O_BINARY);
#endif #endif
#endif /* UNIX */
} }
#if defined(VMS) && !defined(SECURE) #if defined(VMS) && !defined(SECURE)
/* /*