merged branch fabpot/bytes-conversion-epic-fail (PR #9048)

fabpot · fabpot · commit bb97f64cd14d · 2013-09-16T13:23:31.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- fixed bytes conversion when used on 32-bits systems | Q | A | ------------- | --- | Bug fix? | yes (on 32-bits systems) | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8977 | License | MIT | Doc PR | n/a This PR reverts #7413 and #742, which does not work well when a number is big (3Go for instance) and the machine is 32bits. Commits ------- b3ae29d fixed bytes conversion when used on 32-bits systems
diff --git a/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php b/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
@@ -23,20 +23,29 @@ class ServerParams
      */
     public function getPostMaxSize()
     {
-        $iniMax = $this->getNormalizedIniPostMaxSize();
+        $iniMax = strtolower($this->getNormalizedIniPostMaxSize());
 
         if ('' === $iniMax) {
             return null;
         }
 
-        if (preg_match('#^\+?(0X?)?(.*?)([KMG]?)$#', $iniMax, $match)) {
-            $shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);
-            $bases = array('' => 10, '0' => 8, '0X' => 16);
+        $max = ltrim($iniMax, '+');
+        if (0 === strpos($max, '0x')) {
+            $max = intval($max, 16);
+        } elseif (0 === strpos($max, '0')) {
+            $max = intval($max, 8);
+        } else {
+            $max = intval($max);
+        }
 
-            return intval($match[2], $bases[$match[1]]) << $shifts[$match[3]];
+        switch (substr($iniMax, -1)) {
+            case 't': $max *= 1024;
+            case 'g': $max *= 1024;
+            case 'm': $max *= 1024;
+            case 'k': $max *= 1024;
         }
 
-        return 0;
+        return $max;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -262,20 +262,29 @@ public function move($directory, $name = null)
      */
     public static function getMaxFilesize()
     {
-        $max = strtolower(ini_get('upload_max_filesize'));
+        $iniMax = strtolower(ini_get('upload_max_filesize'));
 
-        if ('' === $max) {
+        if ('' === $iniMax) {
             return PHP_INT_MAX;
         }
 
-        if (preg_match('#^\+?(0x?)?(.*?)([kmg]?)$#', $max, $match)) {
-            $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);
-            $bases = array('' => 10, '0' => 8, '0x' => 16);
+        $max = ltrim($iniMax, '+');
+        if (0 === strpos($max, '0x')) {
+            $max = intval($max, 16);
+        } elseif (0 === strpos($max, '0')) {
+            $max = intval($max, 8);
+        } else {
+            $max = intval($max);
+        }
 
-            return intval($match[2], $bases[$match[1]]) << $shifts[$match[3]];
+        switch (substr($iniMax, -1)) {
+            case 't': $max *= 1024;
+            case 'g': $max *= 1024;
+            case 'm': $max *= 1024;
+            case 'k': $max *= 1024;
         }
 
-        return 0;
+        return $max;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -25,7 +25,7 @@ public function __construct()
     {
         $this->data = array(
             'memory'       => 0,
-            'memory_limit' => $this->convertToBytes(strtolower(ini_get('memory_limit'))),
+            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
         );
     }
 
@@ -79,13 +79,22 @@ private function convertToBytes($memoryLimit)
             return -1;
         }
 
-        if (preg_match('#^\+?(0x?)?(.*?)([kmg]?)$#', $memoryLimit, $match)) {
-            $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);
-            $bases = array('' => 10, '0' => 8, '0x' => 16);
+        $max = strtolower(ltrim($memoryLimit, '+'));
+        if (0 === strpos($max, '0x')) {
+            $max = intval($max, 16);
+        } elseif (0 === strpos($max, '0')) {
+            $max = intval($max, 8);
+        } else {
+            $max = intval($max);
+        }
 
-            return intval($match[2], $bases[$match[1]]) << $shifts[$match[3]];
+        switch (substr($memoryLimit, -1)) {
+            case 't': $max *= 1024;
+            case 'g': $max *= 1024;
+            case 'm': $max *= 1024;
+            case 'k': $max *= 1024;
         }
 
-        return 0;
+        return $max;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct()`
`25`	`25`	`{`
`26`	`26`	`$this->data = array(`
`27`	`27`	`'memory' => 0,`
`28`		`- 'memory_limit' => $this->convertToBytes(strtolower(ini_get('memory_limit'))),`
	`28`	`+ 'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`
`@@ -79,13 +79,22 @@ private function convertToBytes($memoryLimit)`
`79`	`79`	`return -1;`
`80`	`80`	`}`
`81`	`81`
`82`		`- if (preg_match('#^\+?(0x?)?(.*?)([kmg]?)$#', $memoryLimit, $match)) {`
`83`		`- $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);`
`84`		`- $bases = array('' => 10, '0' => 8, '0x' => 16);`
	`82`	`+ $max = strtolower(ltrim($memoryLimit, '+'));`
	`83`	`+ if (0 === strpos($max, '0x')) {`
	`84`	`+ $max = intval($max, 16);`
	`85`	`+ } elseif (0 === strpos($max, '0')) {`
	`86`	`+ $max = intval($max, 8);`
	`87`	`+ } else {`
	`88`	`+ $max = intval($max);`
	`89`	`+ }`
`85`	`90`
`86`		`- return intval($match[2], $bases[$match[1]]) << $shifts[$match[3]];`
	`91`	`+ switch (substr($memoryLimit, -1)) {`
	`92`	`+ case 't': $max *= 1024;`
	`93`	`+ case 'g': $max *= 1024;`
	`94`	`+ case 'm': $max *= 1024;`
	`95`	`+ case 'k': $max *= 1024;`
`87`	`96`	`}`
`88`	`97`
`89`		`- return 0;`
	`98`	`+ return $max;`
`90`	`99`	`}`
`91`	`100`	`}`