summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2017-11-11 13:56:57 +0000
committerNiels Thykier <niels@thykier.net>2017-11-11 14:01:52 +0000
commit1d0a3cd604ce374c30e1ed52f15aabbca50d80cb (patch)
tree3fa47133c9808f5c2ef97ce7c1ff54c19bc12b80
parent9573c4dfab15ab0d9d1686504a270ad6e0a1a287 (diff)
downloaddebhelper-1d0a3cd604ce374c30e1ed52f15aabbca50d80cb.tar.gz
dh_builddeb: Avoid using an undefined value as an ARRAY reference
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog2
-rw-r--r--lib/Debian/Debhelper/Dh_Lib.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6e91d5ce..6f5acb4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debhelper (10.10.7) UNRELEASED; urgency=medium
* dh_strip: Fix a regression that caused debug symbols for
executables to be discarded instead of included into
debug packages.
+ * Dh_Lib: Ensure that $dh{U_PARAMS} is always defined as a
+ list. Thanks to Adrian Bunk for the bug report.
-- Niels Thykier <niels@thykier.net> Sat, 11 Nov 2017 13:47:37 +0000
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index f9dba9bf..37be1cc2 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -179,6 +179,8 @@ sub init {
if (! exists $dh{ERROR_HANDLER} || ! defined $dh{ERROR_HANDLER}) {
$dh{ERROR_HANDLER}='exit \$?';
}
+
+ $dh{U_PARAMS} //= [];
}
# Run at exit. Add the command to the log files for the packages it acted