summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2011-01-12 23:57:03 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-01-12 23:57:03 +0100
commit23f3cfd036630c1c8f84159c60986f67167066e8 (patch)
tree4ecd070ff6ee35a23f78907c63ef9f909d2a9c88
parent52b22cea95a1ba506ee633c1610bf241817ab529 (diff)
* deb/dpkgpm.cc:
- fix popen/fclose mismatch reported by cppcheck. Thanks to Petter Reinholdtsen for report and patch! (Closes: #607803)
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
-rw-r--r--debian/changelog5
2 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 95a3f173b..3b10e1a23 100644
--- 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);
- 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);
- fclose(log);
+ pclose(log);
}
}
diff --git a/debian/changelog b/debian/changelog
index 81f741d03..dde28c635 100644
--- 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
+ * 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