systeminformation 5.21.13 → 5.21.15

package/lib/cpu.js

@@ -1604,7 +1604,7 @@ function getLoad() {
         // linux: try to get other cpu stats
         if (_linux) {
           try {
-            const lines = execSync('cat /proc/stat 2>/dev/null | grep cpu').split('\n');
+            const lines = execSync('cat /proc/stat 2>/dev/null | grep cpu').toString().split('\n');
             if (lines.length > 1) {
               lines.shift();
               if (lines.length === cpus.length) {

package/lib/filesystem.js

@@ -1406,7 +1406,7 @@ function diskLayout(callback) {
           workload.push(util.powerShell('Get-PhysicalDisk | select BusType,MediaType,FriendlyName,Model,SerialNumber,Size | fl'));
           if (util.smartMonToolsInstalled()) {
             try {
-              const smartDev = JSON.parse(execSync('smartctl --scan -j'));
+              const smartDev = JSON.parse(execSync('smartctl --scan -j').toString());
               if (smartDev && smartDev.devices && smartDev.devices.length > 0) {
                 smartDev.devices.forEach((dev) => {
                   workload.push(execPromiseSave(`smartctl -j -a ${dev.name}`, util.execOptsWin));

package/lib/system.js

@@ -507,15 +507,17 @@ function baseboard(callback) {
           } catch (e) {
             util.noop();
           }
-          const hardware = util.getValue(linesRpi, 'hardware');
-          if (hardware.startsWith('BCM')) {
-            const rpi = util.decodePiCpuinfo(linesRpi);
-            result.manufacturer = rpi.manufacturer;
-            result.model = 'Raspberry Pi';
-            result.serial = rpi.serial;
-            result.version = rpi.type + ' - ' + rpi.revision;
-            result.memMax = os.totalmem();
-            result.memSlots = 0;
+          if (linesRpi) {
+            const hardware = util.getValue(linesRpi, 'hardware');
+            if (hardware.startsWith('BCM')) {
+              const rpi = util.decodePiCpuinfo(linesRpi);
+              result.manufacturer = rpi.manufacturer;
+              result.model = 'Raspberry Pi';
+              result.serial = rpi.serial;
+              result.version = rpi.type + ' - ' + rpi.revision;
+              result.memMax = os.totalmem();
+              result.memSlots = 0;
+            }
           }
 
           if (callback) { callback(result); }

package/lib/util.js

@@ -705,22 +705,23 @@ function sanitizeShellString(str, strict) {
       s[i] === '$' ||
       s[i] === ';' ||
       s[i] === '&' ||
-      s[i] === '(' ||
-      s[i] === ')' ||
       s[i] === ']' ||
       s[i] === '#' ||
       s[i] === '\\' ||
       s[i] === '\t' ||
       s[i] === '\n' ||
+      s[i] === '\r' ||
       s[i] === '\'' ||
       s[i] === '`' ||
       s[i] === '"' ||
       s[i].length > 1 ||
+      (strict && s[i] === '(') ||
+      (strict && s[i] === ')') ||
       (strict && s[i] === '@') ||
       (strict && s[i] === ' ') ||
       (strict && s[i] == '{') ||
       (strict && s[i] == ';') ||
-      (strict && s[i] == ')'))) {
+      (strict && s[i] == '}'))) {
       result = result + s[i];
     }
   }

package/lib/wifi.js

@@ -147,7 +147,7 @@ function ifaceListLinux() {
   } catch (e) {
     try {
       const all = execSync('nmcli -t -f general,wifi-properties,wired-properties,interface-flags,capabilities,nsp device show 2>/dev/null').toString();
-      const parts = all.split('\nGENERAL.DEVICE:');
+      const parts = all.split('\n\n');
       let i = 1;
       parts.forEach(ifaceDetails => {
         const lines = ifaceDetails.split('\n');
@@ -209,6 +209,9 @@ function nmiConnectionLinux(ssid) {
 }
 
 function wpaConnectionLinux(iface) {
+  if (!iface) {
+    return {};
+  }
   const cmd = `wpa_cli -i ${iface} status 2>&1`;
   try {
     const lines = execSync(cmd).toString().split('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.21.13",
+  "version": "5.21.15",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",