Fix inverted test of eof in parsedb, while looking for eof after field

name.

diff --git a/ChangeLog b/ChangeLog
index be8736b16434a8101bf01534be1ae9496d231cb5..61847e84a7042d69ac3352e9dbb8849af3698c41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 13 14:36:37 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * lib/parse.c: Fix inverted test of eof in parsedb, while looking for eof
+    after field name.
+
 Sat Sep 13 14:34:10 CDT 2003 Adam Heath <doogie@debian.org>
 
   * scripts/update-alternatives.pl: Fix inversion test of $state against

diff --git a/debian/changelog b/debian/changelog
index f7c8ed253ccd78e3fa2f0d27ed89ec66f686ea30..0334fd34b95f724151ecfecd95b11ae2f95d1b22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ dpkg (1.10.11) unstable; urgency=low
   * Sebastian Ley <sebastian.ley@mmweg.rwth-aachen.de>:
     Fix inversion test of $state against 'expected' when removing an
     alternative.  Closes: #203791.
+  * Andrew Suffield <asuffield@debian.org>:
+    Fix inverted test of eof in parsedb, while looking for eof after
+    field name.  Closes: #198218
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 

diff --git a/lib/parse.c b/lib/parse.c
index 1e84f94896c68d2f93944306c896f5c84b775259..11165f44c36d16c3470f3f0a087220096aad32f3 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -142,7 +142,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
       while (!EOF_mmap(dataptr, endptr) && !isspace(c) && c!=':' && c!=MSDOS_EOF_CHAR)
         c= getc_mmap(dataptr);
       fieldlen= dataptr - fieldstart - 1;
-      while (EOF_mmap(dataptr, endptr) && c != '\n' && isspace(c)) c= getc_mmap(dataptr);
+      while (!EOF_mmap(dataptr, endptr) && c != '\n' && isspace(c)) c= getc_mmap(dataptr);
       if (EOF_mmap(dataptr, endptr))
         parseerr(NULL,filename,lno, warnto,warncount,&newpig,0,
                  _("EOF after field name `%.*s'"),fieldlen,fieldstart);