Merge pull request blueimp#1152 from naxhh/master

Prevent js crash on orient_image = true
xiaojunchan · Apr 3, 2012 · e5589a2 · e5589a2
2 parents ea5b386 + 7b4acb9
commit e5589a2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/server/php/upload.class.php b/server/php/upload.class.php
@@ -229,7 +229,12 @@ protected function trim_file_name($name, $type) {
     }
 
     protected function orient_image($file_path) {
-      	$exif = exif_read_data($file_path);
+      	$exif = @exif_read_data($file_path);
+
+        if ($exif === false) { //if not exif exists, we don't need to continue
+            return false;
+        }
+
       	$orientation = intval(@$exif['Orientation']);
       	if (!in_array($orientation, array(3, 6, 8))) { 
       	    return false;