From da861ff3a2936fc03ed936f211d287df24aa00af Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 3 May 2018 16:03:12 -0500 Subject: [PATCH] Fix not closing description.txt and fix path seperator 0 length description.txt files were not closed. --- code/qcommon/files.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/qcommon/files.c b/code/qcommon/files.c index e5d91671..4a94463e 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2491,20 +2491,23 @@ void FS_GetModDescription( const char *modDir, char *description, int descriptio int nDescLen; FILE *file; - Com_sprintf( descPath, sizeof ( descPath ), "%s/description.txt", modDir ); + Com_sprintf( descPath, sizeof ( descPath ), "%s%cdescription.txt", modDir, PATH_SEP ); nDescLen = FS_SV_FOpenFileRead( descPath, &descHandle ); - if ( nDescLen > 0 && descHandle ) { + if ( nDescLen > 0 ) { file = FS_FileForHandle(descHandle); Com_Memset( description, 0, descriptionLen ); nDescLen = fread(description, 1, descriptionLen, file); if (nDescLen >= 0) { description[nDescLen] = '\0'; } - FS_FCloseFile(descHandle); } else { Q_strncpyz( description, modDir, descriptionLen ); } + + if ( descHandle ) { + FS_FCloseFile( descHandle ); + } } /*