Filter out null bytes from the firmware version returned by the device

particle-iot · Sep 27, 2023 · e5938ac · e5938ac
1 parent 5a1dd1f
commit e5938ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/device-base.js b/src/device-base.js
@@ -715,7 +715,9 @@ class DeviceBase extends EventEmitter {
 			wLength: proto.MIN_WLENGTH
 		};
 		return this._dev.transferIn(setup).then(data => {
-			return data.toString();
+			// filter out null bytes
+			const nullPos = data.indexOf(0);
+			return (nullPos === -1 ? data : data.slice(0, nullPos)).toString();
 		});
 	}
 

diff --git a/src/device-base.test.js b/src/device-base.test.js
@@ -267,6 +267,12 @@ describe('device-base', () => {
 					expect(dev.firmwareVersion).to.equal('1.0.0');
 				});
 
+				it('filters out null characters from the firmware version string', async () => {
+					usbDev.options.firmwareVersion = '1.0.0\x00';
+					await dev.open();
+					expect(dev.firmwareVersion).to.equal('1.0.0');
+				});
+
 				it('filters out non-printable ASCII characters from the device ID string', async () => {
 					usbDev.options.serialNumber = '222222222222222222222222\x00';
 					await dev.open();