made Mojolicious a little more marcus-proof

mojolicious · Oct 6, 2011 · d1cf14a · d1cf14a
1 parent 9b31238
commit d1cf14a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -10,7 +10,7 @@ use Mojolicious::Routes;
 use Mojolicious::Sessions;
 use Mojolicious::Static;
 use Mojolicious::Types;
-use Scalar::Util 'weaken';
+use Scalar::Util qw/blessed weaken/;
 
 # "Robots don't have any emotions, and sometimes that makes me very sad."
 has controller_class => 'Mojolicious::Controller';
@@ -44,6 +44,8 @@ sub AUTOLOAD {
 
   # Method
   my ($package, $method) = our $AUTOLOAD =~ /^([\w\:]+)\:\:(\w+)$/;
+  croak qq/Undefined subroutine &${package}::$method called/
+    unless blessed $self && $self->isa(__PACKAGE__);
 
   # Check for helper
   croak qq/Can't locate object method "$method" via package "$package"/

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -10,6 +10,7 @@ use Mojo::URL;
 use Mojo::Util;
 
 require Carp;
+require Scalar::Util;
 
 # "Scalpel... blood bucket... priest."
 has [qw/app match/];
@@ -40,6 +41,8 @@ sub AUTOLOAD {
 
   # Method
   my ($package, $method) = our $AUTOLOAD =~ /^([\w\:]+)\:\:(\w+)$/;
+  Carp::croak(qq/Undefined subroutine &${package}::$method called/)
+    unless Scalar::Util::blessed($self) && $self->isa(__PACKAGE__);
 
   # Call helper
   Carp::croak(qq/Can't locate object method "$method" via package "$package"/)