mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrdtool.inc.php: in rrdtool_escape(), fix invalid length (#11001)

Browse Source 
* rrdtool.inc.php: in rrdtool_escape(), fix invalid length

* in rrdtool_escape(), add more debug output

* in rrdtool_escape(), fix substr_count() for $string length < $length; remove debug
This commit is contained in:
Joseph Tingiris
2020-01-07 14:06:55 -05:00
committed by Jellyfrog
parent 08c23b9ca5
commit 4246316cdb
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
includes/rrdtool.inc.php
View File

@@ -277,8 +277,19 @@ function rrdtool_escape($string, $length = null)
{
$result = shorten_interface_type($string);
$result = str_replace("'", '', $result); # remove quotes
if (is_numeric($length)) {
$extra = substr_count($string, ':', 0, $length);
# preserve original $length for str_pad()
# determine correct strlen() for substr_count()
$string_length=strlen($string);
$substr_count_length=$length;
if ($length > $string_length) {
$substr_count_length=$string_length; # If $length is greater than the haystack length, then substr_count() will produce a warning; fix warnings.
}
$extra = substr_count($string, ':', 0, $substr_count_length);
$result = substr(str_pad($result, $length), 0, ($length + $extra));
if ($extra > 0) {
$result = substr($result, 0, (-1 * $extra));
@@ -286,6 +297,7 @@ function rrdtool_escape($string, $length = null)
}
$result = str_replace(':', '\:', $result); # escape colons
return $result.' ';
} // rrdtool_escape