[SPIP] ~maj v3.2.9-->v3.2.11

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

diff --git a/www/plugins-dist/medias/lib/getid3/module.graphic.bmp.php b/www/plugins-dist/medias/lib/getid3/module.graphic.bmp.php
index dc7b30d..276688d 100644 (file)
--- a/www/plugins-dist/medias/lib/getid3/module.graphic.bmp.php
+++ b/www/plugins-dist/medias/lib/getid3/module.graphic.bmp.php
@@ -14,6 +14,9 @@
 //                                                            ///
 /////////////////////////////////////////////////////////////////
 
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+       exit;
+}
 
 class getid3_bmp extends getid3_handler
 {
@@ -334,7 +337,7 @@ class getid3_bmp extends getid3_handler
                                                case 1:
                                                        for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-                                                                       $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+                                                                       $paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
                                                                        for ($i = 7; $i >= 0; $i--) {
                                                                                $paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
                                                                                $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -351,7 +354,7 @@ class getid3_bmp extends getid3_handler
                                                case 4:
                                                        for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
-                                                                       $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+                                                                       $paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
                                                                        for ($i = 1; $i >= 0; $i--) {
                                                                                $paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
                                                                                $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -368,7 +371,7 @@ class getid3_bmp extends getid3_handler
                                                case 8:
                                                        for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-                                                                       $paletteindex = ord($BMPpixelData{$pixeldataoffset++});
+                                                                       $paletteindex = ord($BMPpixelData[$pixeldataoffset++]);
                                                                        $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
                                                                }
                                                                while (($pixeldataoffset % 4) != 0) {
@@ -381,7 +384,7 @@ class getid3_bmp extends getid3_handler
                                                case 24:
                                                        for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-                                                                       $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+                                                                       $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
                                                                        $pixeldataoffset += 3;
                                                                }
                                                                while (($pixeldataoffset % 4) != 0) {
@@ -394,7 +397,7 @@ class getid3_bmp extends getid3_handler
                                                case 32:
                                                        for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
                                                                for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
-                                                                       $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
+                                                                       $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+3]) << 24) | (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
                                                                        $pixeldataoffset += 4;
                                                                }
                                                                while (($pixeldataoffset % 4) != 0) {