protect against load a dir

mohawk2 · mohawk2 · commit 4e3db6e7da4a · 2017-12-31T04:40:05.000Z
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 {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,9 @@ sub _load_sandbox {`
`121`	`121`	`package Plack::Sandbox::%s;`
`122`	`122`	`{`
`123`	`123`	`my $app = do $_file;`
`124`		`- if ( !$app && ( my $error = $@ \|\| $! )) { die $error; }`
	`124`	`+ if ( !$app && ( my $error = $@ \|\| $! \|\| "returned invalid value.\n")) {`
	`125`	`+ die $error;`
	`126`	`+ }`
`125`	`127`	`$app;`
`126`	`128`	`}`
`127`	`129`	`END_EVAL`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,13 @@ use Test::More;`
`45`	`45`	`unlike $@, qr/Died/;`
`46`	`46`	`}`
`47`	`47`
	`48`	`+{`
	`49`	`+ eval { Plack::Util::load_psgi("t/Plack-Util/") };`
	`50`	`+ # Perl 5.20+ gives "Did you try to load a directory",`
	`51`	`+ # <=5.18 "No such file or directory"`
	`52`	`+ like $@, qr/Error while loading/;`
	`53`	`+}`
	`54`	`+`
`48`	`55`	`{`
`49`	`56`	`my $app = Plack::Util::load_psgi("t/Plack-Util/bin/findbin.psgi");`
`50`	`57`	`test_psgi $app, sub {`