Fix dereference in cu_closefd(), which was the cause of close(random

number) on most arches, but close(0) on s390x.

diff --git a/ChangeLog b/ChangeLog
index 20e9f378a7b08d9c6f79d0df39b9e1644021fa23..528ece6849e437302c1bdd4c5d05e4d31fb2b7fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 15 12:48:36 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * main/help.c: Fix dereference in cu_closefd(), which was the cause of
+    close(random number) on most arches, but close(0) on s390x.
+
 Sun Sep 15 12:43:00 CDT 2002 Adam Heath <doogie@debian.org>
 
   * version-nr, debian/changelog: Set 1.10.9 version.

diff --git a/debian/changelog b/debian/changelog
index d7942ccc4d882cb3beced0d04439a4f2645592af..7fa50847497c24712f37c61bc2938a52e904033a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dpkg (1.10.9) unstable; urgency=low
 
+  * Fix dereference in main/help.c:cu_closefd(), which was the cause of
+    close(random number) on most arches, but close(0) on s390x.
+
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 
 dpkg (1.10.8) unstable; urgency=low

diff --git a/main/help.c b/main/help.c
index 0af99c97b52580f9b73da8b80de86232f08becdc..9cde30ceed9487a23fae68f78b3ead963363e33e 100644 (file)
--- a/main/help.c
+++ b/main/help.c
@@ -135,7 +135,7 @@ void cu_closedir(int argc, void **argv) {
 }
 
 void cu_closefd(int argc, void **argv) {
-  int ip= *(int*)argv;
+  int ip= *(int*)argv[0];
   close(ip);
 }