4 files changed, 4 insertions, 4 deletions

diff --git a/type/Default.class.php b/type/Default.class.php
index fd562b4..13e45c9 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -287,7 +287,7 @@ class Type_Default {
                 foreach ($sources as $source) {
                         $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
                         $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors;
-                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $dsname);
+                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
                         $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format);
diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index 3999ea6..bbbbea7 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -51,7 +51,7 @@ class Type_GenericIO extends Type_Default {
 
                 foreach($sources as $source) {
                         $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
-                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->colors[$source], $dsname);
+                        $rrdgraph[] = sprintf('LINE1:avg_%s#%s:\'%s\'', crc32hex($source), $this->colors[$source], $this->rrd_escape($dsname));
                         $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format);
diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php
index f306532..a0ae4c5 100644
--- a/type/GenericStacked.class.php
+++ b/type/GenericStacked.class.php
@@ -53,7 +53,7 @@ class Type_GenericStacked extends Type_Default {
                 foreach ($sources as $source) {
                         $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
                         $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
-                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $dsname);
+                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
                         $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format);
                         $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format);
diff --git a/type/Uptime.class.php b/type/Uptime.class.php
index cadb8dd..aa91a6e 100644
--- a/type/Uptime.class.php
+++ b/type/Uptime.class.php
@@ -45,7 +45,7 @@ class Type_Uptime extends Type_Default {
                         $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
 
                         //current value
-                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $dsname);
+                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
                         $rrdgraph[] = sprintf('GPRINT:c_avg_%s:LAST:\'%s days\\l\'', crc32hex($source), $this->rrd_format);
 
                         //max value