Enforce $wgSVGMaxSize when rendering, even for SVGs with a very large source size...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e41d961..3dc6c27 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -452,6 +452,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 912) Search box easier to reach in text browsers (lynx, links)
 * $wgParserCacheExpireTime added
 * Skip loading of RecentChange.php except where needed
+* Enforce $wgSVGMaxSize when rendering, even for SVGs with a very large source 
+  size. This is necessary to limit server memory usage.
 
 
 === Caveats ===

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1f8103d..3af6155 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1220,7 +1220,7 @@ $wgSVGConverters = array(
 $wgSVGConverter = 'ImageMagick';
 /** If not in the executable PATH, specify */
 $wgSVGConverterPath = '';
-/** Don't scale a SVG larger than this unless its native size is larger */
+/** Don't scale a SVG larger than this */
 $wgSVGMaxSize = 1024;
 /**
  * Don't thumbnail an image if it will use too much working memory

diff --git a/includes/Image.php b/includes/Image.php
index 6b27f5e..17f3f8c 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -945,11 +945,9 @@ class Image
                        return null;
                }
 
-               $maxsize = $this->mustRender()
-                       ? max( $this->width, $wgSVGMaxSize )
-                       : $this->width - 1;
+               # Don't make an image bigger than the source, or wgMaxSVGSize for SVGs
+               $maxsize = $this->mustRender() ? $wgSVGMaxSize : $this->width - 1;
                if( $width > $maxsize ) {
-                       # Don't make an image bigger than the source
                        $thumb = new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
                        wfProfileOut( $fname );
                        return $thumb;