summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-01 21:56:06 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-01 21:56:06 +0000
commit6dc25b55ba0026ab1cc6d89c4f39346e553cab6b (patch)
tree26de703227a7365b974fbc43a7f9e5f014066d07
parent9f6b6d8d19c17bdb5a30573c0ffc64e4177c7a49 (diff)
downloadglibc-6dc25b55ba0026ab1cc6d89c4f39346e553cab6b.tar.gz
glibc-6dc25b55ba0026ab1cc6d89c4f39346e553cab6b.tar.xz
glibc-6dc25b55ba0026ab1cc6d89c4f39346e553cab6b.zip
Update.
	* resolv/res_hconf.c (parse_line): Skip empty lines.  Bug reported
	by Marcus Harnisch <marcus@harnisch.isdn.cs.tu-berlin.de>.

1999-03-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
-rw-r--r--ChangeLog5
-rw-r--r--resolv/res_hconf.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23f1a1ff5c..63daabbff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-03-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
+	* resolv/res_hconf.c (parse_line): Skip empty lines.  Bug reported
+	by Marcus Harnisch <marcus@harnisch.isdn.cs.tu-berlin.de>.
+
+1999-03-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
 	* sysdeps/i386/sys/ucontext.h (ucontext): Rename field uc_links to
 	uc_link which is the right name according to Unix98.
 	Reported by Craig Metz [PR libc/1001].
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 3905360d50..06306f7726 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -263,7 +263,8 @@ parse_line (const char *fname, int line_num, const char *str)
 
   str = skip_ws (str);
 
-  if (*str == '#') return;		/* skip line comment */
+  /* skip line comment and empty lines: */
+  if (*str == '\0' || *str == '#') return;
 
   start = str;
   str = skip_string (str);