* lib/parse.c: Oops. EOF_mmap was incorrectly detecting the end of the

    data block.
  * main/depcon.c: After fixing the above bug, and using debootstrap to
    build a sid chroot, I discovered that my previous dependency cycle fix
    could cause segfaults in some situations.

diff --git a/ChangeLog b/ChangeLog
index 9c07840623613e8c37d31370d27a142a3682c0c6..5f2fb9d9453043d7c1c99f9e97a801d1f5af40ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue May  1 23:05:48 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * lib/parse.c: Oops.  EOF_mmap was incorrectly detecting the end of the
+    data block.
+  * main/depcon.c: After fixing the above bug, and using debootstrap to
+    build a sid chroot, I discovered that my previous dependency cycle fix
+    could cause segfaults in some situations.
+
 Tue May  1 00:24:49 CDT 2001 Adam Heath <doogie@debian.org>
 
   * acconfig.h, config.h.bot, configure.in, lib/varbuf.c, debian/changelog:

diff --git a/debian/changelog b/debian/changelog
index 2572d989649f07cc3558357368a764356dce1108..c5e5b52e859f87c50a37ac09e943439ea4607395 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,16 @@ dpkg (1.10) unstable; urgency=low
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
  
+dpkg (1.9.4) unstable; urgency=low
+
+  * Oops.  EOF_mmap incorrectly detecting the end of the data block.
+    Closes: Bug#95981.
+  * After fixing the above bug, and using debootstrap to build a sid
+    chroot, I discovered that my previous dependency cycle fix could cause
+    segfaults in some situations.
+
+ -- Adam Heath <doogie@debian.org>  Tue,  1 May 2001 23:04:46 -0500
+
 dpkg (1.9.3) unstable; urgency=low
 
   * Fix compiles on ppc. Closes: Bug#95918.

diff --git a/lib/parse.c b/lib/parse.c
index 0d4cbfa6c914fa3dd01ea42f55084ff9dcea245b..83f27a4d76cfdbe1119e1d9e62958d3c13731029 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -123,7 +123,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
 
   lno= 1;
   pdone= 0;
-#define EOF_mmap(dataptr, endptr)      (dataptr > endptr)
+#define EOF_mmap(dataptr, endptr)      (dataptr >= endptr)
 #define getc_mmap(dataptr)             *dataptr++;
 #define ungetc_mmap(c, dataptr, data)  dataptr--;
 

diff --git a/main/depcon.c b/main/depcon.c
index 62522b3457e6ef1365d669b78177d02128bae7ab..8db5a34204f25626c78388775c1c97a22663a081 100644 (file)
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -45,6 +45,7 @@ static int foundcyclebroken(struct cyclesofarlink *thislink,
   const char *postinstfilename;
   struct stat stab;
 
+  if(!possi) return 0;
   /* We're investigating the dependency `possi' to see if it
    * is part of a loop.  To this end we look to see whether the
    * depended-on package is already one of the packages whose

diff --git a/version-nr b/version-nr
index f8e233b27332b4712304d3226a791d32bdd967c5..d615fd0c04ab484eefb407226dab9dd0a922b6c9 100644 (file)
--- a/version-nr
+++ b/version-nr
@@ -1 +1 @@
-1.9.0
+1.9.4