aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-06-07 13:40:37 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-06-07 13:40:37 +0000
commitcf8eef783b46bd537dce77952f19549c21968d89 (patch)
tree0344ef6635e2cd63feeb437d240dd32ce36f8ec8 /phpBB/includes/message_parser.php
parentcd058dd9fe9f86aedb1d864ae78a17cd41003987 (diff)
downloadforums-cf8eef783b46bd537dce77952f19549c21968d89.tar
forums-cf8eef783b46bd537dce77952f19549c21968d89.tar.gz
forums-cf8eef783b46bd537dce77952f19549c21968d89.tar.bz2
forums-cf8eef783b46bd537dce77952f19549c21968d89.tar.xz
forums-cf8eef783b46bd537dce77952f19549c21968d89.zip
do not allow [flash=0,0]... not implemented for images due to the reliance on getimagesize() - as usual both sizes are able to be limited by the maximum/minimum image size configuration options
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8613 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 674e13de49..6c12903999 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -346,6 +346,12 @@ class bbcode_firstpass extends bbcode
$in = trim($in);
$error = false;
+ // Do not allow 0-sizes generally being entered
+ if ($width <= 0 || $height <= 0)
+ {
+ return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]';
+ }
+
// Apply the same size checks on flash files as on images
if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
{