don't leak EDSP solver output fd

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 890252ba430e9c99829e0187a4b53164bdf12206..6e0a0fc2f18d7be18221cfcc4576d3ce7d08d440 100644 (file)
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -625,7 +625,7 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
        }
 
        FileFd in;
        }
 
        FileFd in;

-       in.OpenDescriptor(input, FileFd::ReadOnly);
+       in.OpenDescriptor(input, FileFd::ReadOnly, true);

        pkgTagFile response(&in, 100);
        pkgTagSection section;
 
        pkgTagFile response(&in, 100);
        pkgTagSection section;
 

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 57d4214e80635fd62ec9b057ef6b4fd4d869c7a5..f1624cd6a81325a2efc8bd13dd8f4190d8abb168 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -109,8 +109,9 @@ namespace EDSP                                                              /*{{{*/
         *
         *  This method takes care of interpreting whatever the solver sends
         *  through the standard output like a solution, progress or an error.
         *
         *  This method takes care of interpreting whatever the solver sends
         *  through the standard output like a solution, progress or an error.

-        *  The main thread should handle his control over to this method to
-        *  wait for the solver to finish the given task
+        *  The main thread should hand his control over to this method to
+        *  wait for the solver to finish the given task. The file descriptor
+        *  used as input is completely consumed and closed by the method.

         *
         *  \param input file descriptor with the response from the solver
         *  \param Cache the solution should be applied on if any
         *
         *  \param input file descriptor with the response from the solver
         *  \param Cache the solution should be applied on if any