Просмотр исходного кода

* 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.

Adam Heath лет назад: 25
Родитель
Сommit
f10d121618
5 измененных файлов с 21 добавлено и 2 удалено
  1. 8 0
      ChangeLog
  2. 10 0
      debian/changelog
  3. 1 1
      lib/parse.c
  4. 1 0
      main/depcon.c
  5. 1 1
      version-nr

+ 8 - 0
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:

+ 10 - 0
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.

+ 1 - 1
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--;
 

+ 1 - 0
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

+ 1 - 1
version-nr

@@ -1 +1 @@
-1.9.0
+1.9.4