Changeset 6438

Timestamp:

12/20/2007 10:18:28 PM (12 years ago)

Author:

westi

Message:

Ensure we don't call exif_read_data() on unsupported file types. Fixes #5397 props DD32

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (3 diffs)
• wp-includes/compat.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -250 +250 @@
     if ( !file_exists( $file ) )
         return false;
+
+    list(,,$sourceImageType) = getimagesize( $file );
 
     // exif contains a bunch of data we'll probably never need formatted in ways that are difficult to use.
@@ -288 +290 @@
 
     // fetch additional info from exif if available
-    if ( is_callable('exif_read_data') ) {
+    if ( is_callable('exif_read_data') && in_array($sourceImageType, apply_filters('wp_read_image_metadata_types', array(IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM)) ) ) {
         $exif = exif_read_data( $file );
         if (!empty($exif['FNumber']))
@@ -305 +307 @@
     // FIXME: try other exif libraries if available
 
-    return apply_filters( 'wp_read_image_metadata', $meta, $file );
+    return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType );
 
 }

trunk/wp-includes/compat.php

@@ -179 +179 @@
     define('IMAGETYPE_PNG', 3);
 
+if (!defined('IMAGETYPE_TIFF_MM'))
+    define('IMAGETYPE_TIFF_MM',7);
+
+if (!defined('IMAGETYPE_TIFF_MM'))
+    define('IMAGETYPE_TIFF_MM',8);
 
 ?>