From 162de4fc9da124eda89960d162f66d514b1d633d Mon Sep 17 00:00:00 2001 From: meep-eep Date: Mon, 17 Feb 2003 21:59:46 +0000 Subject: [PATCH] Removed bug with assert. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@764 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/melee.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index 7eddec8d2..970fc52b3 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -1855,9 +1855,12 @@ Melee (void) { FILE *load_fp; char configFile[PATH_MAX]; + int res; - assert (snprintf (configFile, PATH_MAX, "%smelee.cfg", - configDir) != -1); + res = snprintf (configFile, PATH_MAX, "%smelee.cfg", configDir); + assert (res != -1); + // strlen (configDir) is supposed to be checked to be + // <= PATH_MAX - 13 load_fp = res_OpenResFile (configFile, "rb"); if (load_fp) { @@ -1904,10 +1907,13 @@ Melee (void) FILE *save_fp; BOOLEAN err; char configFile[PATH_MAX]; + int res; err = FALSE; - assert (snprintf (configFile, PATH_MAX, "%smelee.cfg", - configDir) != -1); + res = snprintf (configFile, PATH_MAX, "%smelee.cfg", configDir); + assert (res != -1); + // strlen (configDir) is supposed to be checked to be + // <= PATH_MAX - 13 save_fp = res_OpenResFile (configFile, "wb"); if (save_fp) {