summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc3
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 6eb3b40ac..d1a275a47 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -879,7 +879,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
const char *s = _("Can not write log, openpty() "
"failed (/dev/pts not mounted?)\n");
fprintf(stderr, "%s",s);
- fprintf(term_out, "%s",s);
+ if(term_out)
+ fprintf(term_out, "%s",s);
master = slave = -1;
} else {
struct termios rtt;
diff --git a/debian/changelog b/debian/changelog
index cd4573468..c2a253484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low
- add "purge" to list of known actions
* apt-pkg/init.h:
- add compatibility with old ABI name until the next ABI break
+ * merge segfault fix from Mario Sanchez Prada, many thanks
+ (closes: #561109)
[ Brian Murray ]
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: