nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1671813 CVE-2006-1549 deep recursion crash

Browse Source
This commit is contained in:
Marc Delisle
2007-03-02 17:22:14 +00:00
parent 3ac25417fa
commit b81f9a364c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash
2007-02-28 Marc Delisle <lem9@users.sourceforge.net> 2007-02-28 Marc Delisle <lem9@users.sourceforge.net>
* libraries/config.default.php: set $cfg['Servers'][$i]['ssl'] default * libraries/config.default.php: set $cfg['Servers'][$i]['ssl'] default
value to false, we got reports from some users having problems with the value to false, we got reports from some users having problems with the

14
libraries/common.lib.php
View File

@@ -264,13 +264,24 @@ function PMA_array_merge_recursive()
} }
/** /**
* calls $function vor every element in $array recursively * calls $function for every element in $array recursively
*
* this function is protected against deep recursion attack CVE-2006-1549,
* 1000 seems to be more than enough
*
* @see http://www.php-security.org/MOPB/MOPB-02-2007.html
* @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549
* *
* @param array $array array to walk * @param array $array array to walk
* @param string $function function to call for every array element * @param string $function function to call for every array element
*/ */
function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false)
{ {
static $recursive_counter = 0;
if (++$recursive_counter > 1000) {
die('possible deep recursion attack');
}
foreach ($array as $key => $value) { foreach ($array as $key => $value) {
if (is_array($value)) { if (is_array($value)) {
PMA_arrayWalkRecursive($array[$key], $function, $apply_to_keys_also); PMA_arrayWalkRecursive($array[$key], $function, $apply_to_keys_also);
@@ -286,6 +297,7 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false)
} }
} }
} }
$recursive_counter++;
} }
/** /**