diff options
| author | plegall <plg@piwigo.org> | 2008-10-16 19:34:46 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2008-10-16 19:34:46 +0000 |
| commit | 4411169d1aa5e477c33794d213394bca591a43a3 (patch) | |
| tree | 931f640ef0b6adcebdec7aec7503b56e9fd2af8d | |
| parent | 9598532f6734864fbf9112711cbd64d901361666 (diff) | |
merge -c2755 from branch 2.0 to branch 1.7
- fix vulnerability http://www.milw0rm.com/exploits/6755
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2762 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | comments.php | 4 | ||||
| -rw-r--r-- | plugins/event_tracer/event_list.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/comments.php b/comments.php index efcd7dfb5..dd722f588 100644 --- a/comments.php +++ b/comments.php @@ -69,7 +69,7 @@ $page['since'] = isset($_GET['since']) ? $_GET['since'] : 4; // $page['sort_by'] = 'date'; // if the form was submitted, it overloads default behaviour -if (isset($_GET['sort_by'])) +if (isset($_GET['sort_by']) and isset($sort_by[$_GET['sort_by']]) ) { $page['sort_by'] = $_GET['sort_by']; } @@ -78,7 +78,7 @@ if (isset($_GET['sort_by'])) // $page['sort_order'] = $sort_order['descending']; // if the form was submitted, it overloads default behaviour -if (isset($_GET['sort_order'])) +if (isset($_GET['sort_order']) and isset($sort_order[$_GET['sort_order']])) { $page['sort_order'] = $sort_order[$_GET['sort_order']]; } diff --git a/plugins/event_tracer/event_list.php b/plugins/event_tracer/event_list.php index 1f1969629..6af136464 100644 --- a/plugins/event_tracer/event_list.php +++ b/plugins/event_tracer/event_list.php @@ -16,7 +16,7 @@ function get_php_files($path, $to_ignore=array(), $recursive=true ) if ( $recursive and is_dir($path.'/'.$node) ) { $files = array_merge($files, get_php_files($path.'/'.$node, $to_ignore)); - + } if ( is_file($path.'/'.$node) ) { @@ -43,7 +43,7 @@ foreach ($files as $file) $code = preg_replace( '#\?'.'>.*<\?php#m', '', $code); $code = preg_replace( '#\/\*.*\*\/#m', '', $code); $code = preg_replace( '#\/\/.*#', '', $code); - + $count = preg_match_all( '#[^a-zA-Z_$-]trigger_(action|event)\s*\(\s*([^,)]+)#m', $code, $matches @@ -57,7 +57,7 @@ foreach ($files as $file) } } -$sort= isset($_GET['sort']) ? $_GET['sort'] : 1; +$sort= isset($_GET['sort']) ? (int)$_GET['sort'] : 1; usort( $events, create_function( '$a,$b', 'return $a['.$sort.']>$b['.$sort.'];' ) |