* Duck warnings when fed an invalid file

diff --git a/includes/Exif.php b/includes/Exif.php
index cf79423..b2b43c1 100644 (file)
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -287,8 +287,14 @@ class Exif {
                
                $this->debugFile( $basename, __FUNCTION__, true );
                wfSuppressWarnings();
-               $this->mRawExifData = exif_read_data( $file );
+               $data = exif_read_data( $file );
                wfRestoreWarnings();
+               /**
+                * exif_read_data() will return false on invalid input, such as
+                * when somebody uploads a file called something.jpeg
+                * containing random gibberish.
+                */
+               $this->mRawExifData = $data ? $data : array();
                
                $this->makeFilteredData();
                $this->makeFormattedData();