This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 25da5c597065fcd033b0755327902a421c4124a0 Author: Guillem Jover <[email protected]> Date: Thu Aug 18 05:17:10 2016 +0200 libdpkg: Do not crash if we pass a NULL cip argument to setaction() --- debian/changelog | 1 + lib/dpkg/options.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 29479f3..fc69242 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium * Switch from non-freeing malloc to m_malloc for invoke hooks. * Always reset the package in-core database when shutting down the package database journal. + * Do not crash if we pass a NULL cip argument to setaction() in libdpkg. * Perl modules: - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors. - Rework keyring hooks in Dpkg::Vendor. Deprecate the keyrings hook, and diff --git a/lib/dpkg/options.c b/lib/dpkg/options.c index 2bcb766..56adcd2 100644 --- a/lib/dpkg/options.c +++ b/lib/dpkg/options.c @@ -315,7 +315,7 @@ option_short(int c) void setaction(const struct cmdinfo *cip, const char *value) { - if (cipaction) + if (cipaction && cip) badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"), option_short(cip->oshort), cip->olong, option_short(cipaction->oshort), cipaction->olong); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
