Merge "Add error checking for file argument"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Dec 2015 01:01:43 +0000 (01:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Dec 2015 01:01:43 +0000 (01:01 +0000)
maintenance/convertExtensionToRegistration.php

index 3e86d8a..828507b 100644 (file)
@@ -79,7 +79,12 @@ class ConvertExtensionToRegistration extends Maintenance {
                        $$var = array();
                }
                unset( $var );
-               require $this->getArg( 0 );
+               $arg = $this->getArg( 0 );
+               if ( !is_file( $arg ) ) {
+                       $this->error( "$arg is not a file.", true );
+               }
+               require $arg;
+               unset( $arg );
                // Try not to create any local variables before this line
                $vars = get_defined_vars();
                unset( $vars['this'] );