summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-08-21 10:55:15 -0500
committerbubulle@debian.org <>2006-08-21 10:55:15 -0500
commit3784e34677882fbea8538baa1c25b0d35abf429a (patch)
tree2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /apt-pkg/deb
parent8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff)
parent02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff)
Merge with Michael and resolve conflicts
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 667db8ff2..bf0434ccc 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -624,7 +624,13 @@ bool pkgDPkgPM::Go(int OutStatusFd)
*/
char* list[5];
- TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
+ if(!TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])))
+ // FIXME: dpkg sends multiline error messages sometimes (see
+ // #374195 for a example. we should support this by
+ // either patching dpkg to not send multiline over the
+ // statusfd or by rewriting the code here to deal with
+ // it. for now we just ignore it and not crash
+ continue;
char *pkg = list[1];
char *action = _strstrip(list[2]);