Stage 1 of deadlock fix (bug #1673 -- but not yet solved, just started) and fix configs ending with no newline (bug #1672)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3025 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 2 deletions

diff --git a/config.c b/config.c
index 574561ab3..954d09509 100755
--- a/config.c
+++ b/config.c
@@ -740,9 +740,8 @@ static struct ast_config *__ast_load(char *configfile, struct ast_config *tmp, s
 			return NULL;
 		}
 		while(!feof(f)) {
-			fgets(buf, sizeof(buf), f);
 			lineno++;
-			if (!feof(f)) {
+			if (fgets(buf, sizeof(buf), f)) {
 				if (cfg_process(tmp, _tmpc, _last, buf, lineno, configfile, includelevel
 #ifdef PRESERVE_COMMENTS
 				, acs