Properly close triggers 'File' file to not leak it to the childs

diff --git a/ChangeLog b/ChangeLog
index 4d823db43cb375e74ef673a6261f265f1d2fa8cc..a4fb75ad659d8a66192e3dbb625c86bc6590c3ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-16  Guillem Jover  <guillem@debian.org>
+
+       * lib/triglib.c (trig_file_interests_ensure): Pass the proper mask
+       to push_cleanup to make sure pop_cleanup closes the file.
+
 2008-05-15  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-divert.pl (checkrename): Do not check the target file

diff --git a/debian/changelog b/debian/changelog
index 8c54d2f026559305dedf3f8613c0a6dd9e38a61e..ba76d1ee65b8b701e0da42065d0b529734c8f06c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dpkg (1.14.20) UNRELEASED; urgency=low
   * When dpkg-divert does renames do no check the target file if the source
     does not exist and the rename is thus being disabled. This also allows
     to remove bogus diversions. Closes: #476973, #469033
+  * Properly close triggers 'File' file, so it does not get leaked to childs.
 
   [ Raphael Hertzog ]
   * Add missing 'use File::Path' in Dpkg::Source::Package::V3::quilt.

diff --git a/lib/triglib.c b/lib/triglib.c
index 59b9bc9644187b118e162d8ae13d8795f61646c7..f86aaf63adabb8d3bee7f3e5c629be128b0af4b0 100644 (file)
--- a/lib/triglib.c
+++ b/lib/triglib.c
@@ -480,7 +480,7 @@ trig_file_interests_ensure(void)
                        triggersfilefile);
        }
 
-       push_cleanup(cu_closefile, 0, NULL, 0, 1, f);
+       push_cleanup(cu_closefile, ~0, NULL, 0, 1, f);
        while (fgets_checked(linebuf, sizeof(linebuf), f, triggersfilefile) >= 0) {
                space = strchr(linebuf, ' ');
                if (!space || linebuf[0] != '/')