protect against load a dir

plack · Dec 31, 2017 · 4e3db6e · 4e3db6e
1 parent f2a113c
commit 4e3db6e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Plack/Util.pm b/lib/Plack/Util.pm
@@ -121,7 +121,9 @@ sub _load_sandbox {
 package Plack::Sandbox::%s;
 {
     my $app = do $_file;
-    if ( !$app && ( my $error = $@ || $! )) { die $error; }
+    if ( !$app && ( my $error = $@ || $! || "returned invalid value.\n")) {
+        die $error;
+    }
     $app;
 }
 END_EVAL

diff --git a/t/Plack-Util/load.t b/t/Plack-Util/load.t
@@ -45,6 +45,13 @@ use Test::More;
     unlike $@, qr/Died/;
 }
 
+{
+    eval { Plack::Util::load_psgi("t/Plack-Util/") };
+    # Perl 5.20+ gives "Did you try to load a directory",
+    #   <=5.18 "No such file or directory"
+    like $@, qr/Error while loading/;
+}
+
 {
     my $app = Plack::Util::load_psgi("t/Plack-Util/bin/findbin.psgi");
     test_psgi $app, sub {