diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-02-03 14:55:01 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-02-04 12:43:18 -0200 |
| commit | 46b12609e51b9b3113abc9c22a1b0ad5a2b37d11 (patch) | |
| tree | 0cadd8627871d2e8f159d093852e665a02e39777 /etc/inc/rrd.inc | |
| parent | 44f2ef9b486fc3e4e2a183ae157a86a9e8ac9018 (diff) | |
| download | pfsense-46b12609e51b9b3113abc9c22a1b0ad5a2b37d11.zip pfsense-46b12609e51b9b3113abc9c22a1b0ad5a2b37d11.tar.gz | |
Add escapeshellarg() calls on exec parameters. While I'm here, replace some exec() calls by php functions like symlink, copy, unlink, mkdir
Conflicts:
etc/inc/filter_log.inc
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
Diffstat (limited to 'etc/inc/rrd.inc')
| -rw-r--r-- | etc/inc/rrd.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index d09ef82..a66120a 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -37,9 +37,9 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; if(file_exists($xmldumpfile)) - mwexec("rm {$xmldumpfile}"); + unlink($xmldumpfile); - exec("$rrdtool dump {$rrddatabase} {$xmldumpfile} 2>&1", $dumpout, $dumpret); + exec("$rrdtool dump " . escapeshellarg($rrddatabase) . " {$xmldumpfile} 2>&1", $dumpout, $dumpret); if ($dumpret <> 0) { $dumpout = implode(" ", $dumpout); log_error(sprintf(gettext('RRD dump failed exited with %1$s, the error is: %2$s'), $dumpret, $dumpout)); |
