aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-09-15 13:27:06 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-09-15 13:27:06 +0000
commit36e99af959799eab6610fc6f3ca0e2c76ba4020f (patch)
tree6c007e9bb7861f21e1a8cdab7c04992f548c00c7 /phpBB/includes
parent09f6cf11dd16893eea6836175773454a382f04df (diff)
downloadforums-36e99af959799eab6610fc6f3ca0e2c76ba4020f.tar
forums-36e99af959799eab6610fc6f3ca0e2c76ba4020f.tar.gz
forums-36e99af959799eab6610fc6f3ca0e2c76ba4020f.tar.bz2
forums-36e99af959799eab6610fc6f3ca0e2c76ba4020f.tar.xz
forums-36e99af959799eab6610fc6f3ca0e2c76ba4020f.zip
#14466
git-svn-id: file:///svn/phpbb/trunk@8091 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index fed783e880..86113899c7 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1975,14 +1975,14 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var
while (($file = readdir($dp)) !== false)
{
- if ($file[0] != '.' && is_dir("$path/$file"))
+ if ($file[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $file) && is_dir("$path/$file"))
{
$avatar_row_count = $avatar_col_count = 0;
$dp2 = @opendir("$path/$file");
while (($sub_file = readdir($dp2)) !== false)
{
- if (preg_match('#^[^&"<>]*\.(?:gif|png|jpe?g)$#i', $sub_file))
+ if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file))
{
$avatar_list[$file][$avatar_row_count][$avatar_col_count] = array(
'file' => "$file/$sub_file",