* deb/dpkgpm.cc:

  - fix popen/fclose mismatch reported by cppcheck. Thanks to Petter
    Reinholdtsen for report and patch! (Closes: #607803)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 95a3f173b587e064f3055a22fdb5dd00b0f81349..3b10e1a23eaadcf8b943c7a1db192d94c751c253 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1411,7 +1411,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);
       {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);

-        fclose(log);
+        pclose(log);

       }
    }
 
       }
    }
 


@@ -1427,7 +1427,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);
       {
         while( fgets(buf, sizeof(buf), log) != NULL)
            fprintf(report, " %s", buf);

-        fclose(log);
+        pclose(log);

       }
    }
 
       }
    }
 

diff --git a/debian/changelog b/debian/changelog
index 81f741d03fb8af47031a1881fefed0acaa32ba57..dde28c635f2feeea020381c48fea7589ac6f5664 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,11 @@ apt (0.8.11+wheezy) unstable; urgency=low
     - include stddefs.h to fix compile error (undefined NULL) with gcc-4.6
   * methods/https.cc:
     - fix CURLOPT_SSL_VERIFYHOST by really passing 2 to it if enabled
     - include stddefs.h to fix compile error (undefined NULL) with gcc-4.6
   * methods/https.cc:
     - fix CURLOPT_SSL_VERIFYHOST by really passing 2 to it if enabled

+  * deb/dpkgpm.cc:
+    - fix popen/fclose mismatch reported by cppcheck. Thanks to Petter
+      Reinholdtsen for report and patch! (Closes: #607803)

 
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Jan 2011 23:46:08 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Jan 2011 23:53:32 +0100

 
 apt (0.8.10) unstable; urgency=low
 
 
 apt (0.8.10) unstable; urgency=low