Throw invalid dimension exception during rendering graph with wrong height/width values (#17320)

* wip

* invalid dimension exception

* re-throw excpetion

2 files changed, 8 insertions, 0 deletions

diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index 4402b14bfd..0a4863ecc8 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -14,6 +14,7 @@ use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\DataTable\Map;
+use Piwik\Exception\InvalidDimensionException;
 use Piwik\Filesystem;
 use Piwik\Period;
 use Piwik\Piwik;
@@ -493,6 +494,8 @@ class API extends \Piwik\Plugin\API
 
             // render graph
             $graph->renderGraph();
+        } catch (InvalidDimensionException $e) {
+            throw $e;
         } catch (\Exception $e) {
 
             $graph = new \Piwik\Plugins\ImageGraph\StaticGraph\Exception();
diff --git a/plugins/ImageGraph/StaticGraph/GridGraph.php b/plugins/ImageGraph/StaticGraph/GridGraph.php
index 9a95577892..a558f76332 100644
--- a/plugins/ImageGraph/StaticGraph/GridGraph.php
+++ b/plugins/ImageGraph/StaticGraph/GridGraph.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\ImageGraph\StaticGraph;
 
+use Piwik\Exception\InvalidDimensionException;
 use Piwik\Plugins\ImageGraph\StaticGraph;
 
 /**
@@ -145,6 +146,10 @@ abstract class GridGraph extends StaticGraph
             }
         }
 
+        if (($bottomRightYValue - $topLeftYValue) <= ($ordinateAxisLength / 2)) {
+            throw new InvalidDimensionException('Error: the graph dimension is not valid. Please try larger width and height values or use 0 for default values.');
+        }
+
         $gridColor = $this->gridColor;
         $this->pImage->drawScale(
             array(