From 806604bdc027a2bdb389db937fdbdbff8c97d57a Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 16 Mar 2003 10:06:58 +0000 Subject: [PATCH] Handle EOF correctly. --- lib/silcutil/silcconfig.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/silcutil/silcconfig.c b/lib/silcutil/silcconfig.c index 2066f957..03fb2a49 100644 --- a/lib/silcutil/silcconfig.c +++ b/lib/silcutil/silcconfig.c @@ -95,7 +95,7 @@ char *silc_config_strerror(int errnum) static void my_trim_spaces(SilcConfigFile *file) { register char *r = file->p; - while (isspace(*r)) + while ((*r != '\0' && *r != EOF) && isspace(*r)) if (*r++ == '\n') file->line++; file->p = r; } @@ -103,8 +103,8 @@ static void my_trim_spaces(SilcConfigFile *file) static void my_skip_line(SilcConfigFile *file) { register char *r = file->p; - while (*r && (*r != '\n') && (*r != '\r')) r++; - file->p = (*r ? r + 1 : r); + while ((*r != '\0' && *r != EOF) && (*r != '\n') && (*r != '\r')) r++; + file->p = ((*r != '\0' && *r != EOF) ? r + 1 : r); file->line++; } /* Obtains a text token from the current position until first separator. -- 2.43.0