Skip to content
Snippets Groups Projects
Commit 171ff19f authored by Arnaud Ferraris's avatar Arnaud Ferraris
Browse files

d/patches: Drop upstreamed patch 0001-f_dir-should-exist.patch


Signed-off-by: default avatarArnaud Ferraris <arnaud.ferraris@collabora.com>
parent 2ef7c894
No related branches found
No related tags found
1 merge request!2Update from debian/bullseye for apertis/v2022dev2
From 88c3ca044a3881eab62d6d2d38490351fd421386 Mon Sep 17 00:00:00 2001
From: "H.Merijn Brand - Tux" <linux@tux.freedom.nl>
Date: Wed, 28 Oct 2020 15:56:53 +0100
Subject: [PATCH] f_dir should exist
From a CVE fix in DBI-1.644 / DBD::File-0.45
---
t/11_dsnlist.t | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/t/11_dsnlist.t b/t/11_dsnlist.t
index 8370976..3e97d45 100644
--- a/t/11_dsnlist.t
+++ b/t/11_dsnlist.t
@@ -24,9 +24,19 @@ ok (@dsn >= 2, "more than one");
ok ($dbh->disconnect, "disconnect");
# Try different DSN's
-foreach my $d (qw( . example lib t )) {
+foreach my $d (qw( . examples lib t )) {
ok (my $dns = Connect ("dbi:CSV:f_dir=$d"), "use $d as f_dir");
ok ($dbh->disconnect, "disconnect");
}
+if ($DBD::File::VERSION ge "0.45") {
+ my @err;
+ is (eval {
+ local $SIG{__WARN__} = sub { push @err => @_ };
+ local $SIG{__DIE__} = sub { push @err => @_ };
+ Connect ("dbi:CSV:f_dir=d/non/exist/here");
+ }, undef, "f_dir = nonexting dir");
+ like ("@err", qr{d/non/exist/here}, "Error caught");
+ }
+
done_testing ();
--
2.20.1
0001-f_dir-should-exist.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment