[SPIP] v3.2.12 -> v3.2.12 - Reinstallation avec le spip_loader

[lhc/web/www.git] / www / plugins-dist / medias / lib / getid3 / module.graphic.pcd.php

diff --git a/www/plugins-dist/medias/lib/getid3/module.graphic.pcd.php b/www/plugins-dist/medias/lib/getid3/module.graphic.pcd.php
old mode 100644 (file)
new mode 100755 (executable)
index 8824479..85fb4c9
--- a/www/plugins-dist/medias/lib/getid3/module.graphic.pcd.php
+++ b/www/plugins-dist/medias/lib/getid3/module.graphic.pcd.php
@@ -14,7 +14,9 @@
 //                                                            ///
 /////////////////////////////////////////////////////////////////
 
-
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+       exit;
+}
 class getid3_pcd extends getid3_handler
 {
        public $ExtractData = 0;
@@ -48,6 +50,7 @@ class getid3_pcd extends getid3_handler
                if ($this->ExtractData > 3) {
 
                        $this->error('Cannot extract PSD image data for detail levels above BASE (level-3) because encrypted with Kodak-proprietary compression/encryption.');
+                       return false;
 
                } elseif ($this->ExtractData > 0) {
 
@@ -76,11 +79,11 @@ class getid3_pcd extends getid3_handler
 
                                for ($x = 0; $x < $PCD_width; $x++) {
                                        if ($PCDisVertical) {
-                                               $info['pcd']['data'][$PCD_width - $x][$y]     = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{(int) floor($x / 2)}), ord($PCD_data_Cr{(int) floor($x / 2)}));
-                                               $info['pcd']['data'][$PCD_width - $x][$y + 1] = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{(int) floor($x / 2)}), ord($PCD_data_Cr{(int) floor($x / 2)}));
+                                               $info['pcd']['data'][$PCD_width - $x][$y]     = $this->YCbCr2RGB(ord($PCD_data_Y1[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
+                                               $info['pcd']['data'][$PCD_width - $x][$y + 1] = $this->YCbCr2RGB(ord($PCD_data_Y2[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
                                        } else {
-                                               $info['pcd']['data'][$y][$x]                  = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{(int) floor($x / 2)}), ord($PCD_data_Cr{(int) floor($x / 2)}));
-                                               $info['pcd']['data'][$y + 1][$x]              = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{(int) floor($x / 2)}), ord($PCD_data_Cr{(int) floor($x / 2)}));
+                                               $info['pcd']['data'][$y][$x]                  = $this->YCbCr2RGB(ord($PCD_data_Y1[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
+                                               $info['pcd']['data'][$y + 1][$x]              = $this->YCbCr2RGB(ord($PCD_data_Y2[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
                                        }
                                }
                        }
@@ -100,6 +103,7 @@ class getid3_pcd extends getid3_handler
 
                }
 
+               return false;
        }
 
        /**