Merge "Perform input validation for file $page at some strategic locations"

diff --combined includes/filerepo/file/LocalFile.php
index 8d715e8,9ec7e00..e1c2546
--- 1/includes/filerepo/file/LocalFile.php
--- 2/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@@ -716,6 -716,11 +716,11 @@@ class LocalFile extends File 
         * @return int
         */
        public function getWidth( $page = 1 ) {
+               $page = (int)$page;
+               if ( $page < 1 ) {
+                       $page = 1;
+               }
+ 
                $this->load();
  
                if ( $this->isMultipage() ) {
@@@ -743,6 -748,11 +748,11 @@@
         * @return int
         */
        public function getHeight( $page = 1 ) {
+               $page = (int)$page;
+               if ( $page < 1 ) {
+                       $page = 1;
+               }
+ 
                $this->load();
  
                if ( $this->isMultipage() ) {
@@@ -1200,13 -1210,7 +1210,13 @@@
                $options = [];
                $handler = MediaHandler::getHandler( $props['mime'] );
                if ( $handler ) {
 -                      $options['headers'] = $handler->getStreamHeaders( $props['metadata'] );
 +                      $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
 +
 +                      if ( !is_array( $metadata ) ) {
 +                              $metadata = [];
 +                      }
 +
 +                      $options['headers'] = $handler->getContentHeaders( $metadata );
                } else {
                        $options['headers'] = [];
                }