Merge pull request #28 from aj-ptw/master

FIX: Buffer problems
openbci-archive · Mar 13, 2018 · 12f7859 · 12f7859
2 parents 88b0bca + f929d9d
commit 12f7859
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.3.4
+
+### Bug Fixes 
+
+* Protect and ensure buffer returned for raw data packets
+
 # v0.3.3
 
 ### Enhancements 

diff --git a/README.md b/README.md
@@ -7,10 +7,10 @@
   Provide a stable javascript library for OpenBCI
 </p>
 
-[![Build Status](https://travis-ci.org/OpenBCI/OpenBCI_NodeJS_Utilities.svg?branch=master)](https://travis-ci.org/OpenBCI/OpenBCI_NodeJS_Utilities)
-[![codecov](https://codecov.io/gh/OpenBCI/OpenBCI_NodeJS_Utilities/branch/master/graph/badge.svg)](https://codecov.io/gh/OpenBCI/OpenBCI_NodeJS_Utilities)
-[![Dependency Status](https://david-dm.org/OpenBCI/OpenBCI_NodeJS_Utilities.svg)](https://david-dm.org/OpenBCI/OpenBCI_NodeJS_Utilities)
-[![npm](https://img.shields.io/npm/dm/openbci-ganglion.svg?maxAge=2592000)](http://npmjs.com/package/openbci-utilities)
+[![Build Status](https://travis-ci.org/OpenBCI/OpenBCI_JavaScript_Utilities.svg?branch=master)](https://travis-ci.org/OpenBCI/OpenBCI_JavaScript_Utilities)
+[![codecov](https://codecov.io/gh/OpenBCI/OpenBCI_Javascript_Utilities/branch/master/graph/badge.svg)](https://codecov.io/gh/OpenBCI/OpenBCI_Javascript_Utilities)
+[![Dependency Status](https://david-dm.org/OpenBCI/OpenBCI_Javascript_Utilities.svg)](https://david-dm.org/OpenBCI/OpenBCI_Javascript_Utilities)
+[![npm](https://img.shields.io/npm/dm/openbci-utilities.svg?maxAge=2592000)](http://npmjs.com/package/openbci-utilities)
 [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard)
 
 ## Welcome!

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openbci-utilities",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "The official utility package of Node.js SDK for the OpenBCI Biosensor Boards.",
   "main": "dist/openbci-utilities.js",
   "module": "src/index.js",

diff --git a/src/utilities.js b/src/utilities.js
@@ -98,9 +98,12 @@ let utilitiesModule = {
           // Overwrite the dataBuffer with a new buffer
           let tempBuf;
           if (parsePosition > 0) {
-            tempBuf = Buffer.concat([dataBuffer.slice(0, parsePosition), dataBuffer.slice(parsePosition + k.OBCIPacketSize)], dataBuffer.byteLength - k.OBCIPacketSize);
+            tempBuf = Buffer.concat([
+              Buffer.from(dataBuffer.slice(0, parsePosition)),
+              Buffer.from(dataBuffer.slice(parsePosition + k.OBCIPacketSize))
+            ]);
           } else {
-            tempBuf = dataBuffer.slice(k.OBCIPacketSize);
+            tempBuf = Buffer.from(dataBuffer.slice(k.OBCIPacketSize));
           }
           if (tempBuf.length === 0) {
             dataBuffer = null;