diff --git a/.gitignore b/.gitignore
index 2752239..ced409a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .git*
 
 locales/po/*.mo
+.omc/
diff --git a/linux_wmi.php b/linux_wmi.php
index c154043..e246522 100644
--- a/linux_wmi.php
+++ b/linux_wmi.php
@@ -219,12 +219,15 @@ function getcommand() {
 
 		$this->clean();
 
+		// Quote the delimiter for the shell only. $this->separator stays raw for
+		// the explode() in fetch(); its default (|+|) is otherwise split as a
+		// shell pipeline.
 		return $this->binary .
-			' --delimiter=' . $this->separator .
+			' --delimiter=' . cacti_escapeshellarg($this->separator) .
 			' --user=' . $this->username .
 			' --password=' . $this->password .
-			($this->querynspace != '' ? ' --namespace=' . $this->querynspace:'') .
-			' //' . trim($this->hostname) .
+			($this->querynspace != '' ? ' --namespace=' . $this->querynspace : '') .
+			' //' . $this->hostname .
 			' ' . $this->command;
 	}
 
@@ -255,12 +258,27 @@ function exec() {
 		}
 	}
 
+	/* A hostname/namespace never legitimately contains shell or cmd.exe
+	 * metacharacters. Strip them (cmd.exe ignores \" and toggles quoting on
+	 * every ", and expands %VAR%) before quoting so a device-supplied address
+	 * cannot inject a command on the Cacti server. */
+	function wmi_clean_arg($value) {
+		global $config;
+
+		if (isset($config['cacti_server_os']) && $config['cacti_server_os'] == 'win32') {
+			$value = str_replace(array('"', '&', '|', '^', '<', '>', '(', ')', '%'), '', $value);
+		}
+
+		return $value;
+	}
+
 	function clean() {
-		$this->username  = cacti_escapeshellarg($this->username);
-		$this->password  = cacti_escapeshellarg($this->password);
-		$this->hostname  = trim($this->hostname);
-		$this->binary    = cacti_escapeshellarg($this->binary);
-		$this->command   = cacti_escapeshellarg($this->command);
+		$this->username    = cacti_escapeshellarg($this->username);
+		$this->password    = cacti_escapeshellarg($this->password);
+		$this->hostname    = cacti_escapeshellarg($this->wmi_clean_arg(trim($this->hostname)));
+		$this->querynspace = ($this->querynspace != '' ? cacti_escapeshellarg($this->wmi_clean_arg($this->querynspace)) : '');
+		$this->binary      = cacti_escapeshellarg($this->binary);
+		$this->command     = cacti_escapeshellarg($this->command);
 	}
 
 	function retrieve_account() {
@@ -289,7 +307,7 @@ function retrieve_account() {
 
 	function decode($info) {
 		$info = base64_decode($info);
-		$info = unserialize($info);
+		$info = unserialize($info, array('allowed_classes' => false));
 		$info = $info['password'];
 
 		return $info;
diff --git a/tests/WmiCommandInjectionTest.php b/tests/WmiCommandInjectionTest.php
new file mode 100644
index 0000000..4abdfd7
--- /dev/null
+++ b/tests/WmiCommandInjectionTest.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * Regression: the WMI collector built its wmic command line with the device
+ * hostname and query namespace unescaped, so a device-supplied hostname could
+ * inject a command that runs on the Cacti server. clean() now escapes both and
+ * strips cmd.exe metacharacters on Windows.
+ *
+ * Standalone (the plugin has no test harness): stub the core escaper and $config,
+ * include the collector, and assert getcommand() neutralises an injected value.
+ */
+
+$GLOBALS['config'] = array('cacti_server_os' => 'unix');
+
+if (!function_exists('cacti_escapeshellarg')) {
+	function cacti_escapeshellarg($s) { return escapeshellarg($s); }
+}
+
+require_once __DIR__ . '/../linux_wmi.php';
+
+$fail = 0;
+
+function check($cond, $msg) {
+	global $fail;
+	if ($cond) {
+		print "  ok: $msg\n";
+	} else {
+		print "  FAIL: $msg\n";
+		$fail = 1;
+	}
+}
+
+/* unix: an injected hostname must be single-quote contained, not break out */
+$w = new Linux_WMI();
+$w->username    = 'u';
+$w->password    = 'p';
+$w->binary      = '/usr/bin/wmic';
+$w->command     = 'SELECT Name FROM Win32_OperatingSystem';
+$w->hostname    = '127.0.0.1; touch /tmp/pwned #';
+$w->querynspace = "root\\CIMV2'; id #";
+
+$cmd = $w->getcommand();
+
+check(strpos($cmd, '; touch /tmp/pwned') === false || strpos($cmd, "'127.0.0.1; touch /tmp/pwned #'") !== false,
+	'injected hostname is contained inside a quoted argument');
+check(preg_match('#//\x27#', $cmd) === 1, 'the target host is quoted (//\'...\')');
+check(strpos($cmd, "--namespace='") !== false, 'namespace is quoted');
+
+/* win32: metacharacters are stripped from the hostname before quoting */
+$GLOBALS['config']['cacti_server_os'] = 'win32';
+$w2 = new Linux_WMI();
+$w2->username = 'u'; $w2->password = 'p'; $w2->binary = 'wmic'; $w2->command = 'x';
+$w2->hostname = 'host" & calc.exe & %USERNAME%';
+$cmd2 = $w2->getcommand();
+foreach (array('"', '&', '(', ')', '%') as $meta) {
+	check(strpos(substr($cmd2, strpos($cmd2, '//')), $meta) === false, "win32: '$meta' stripped from the target host");
+}
+
+exit($fail);