2.0.1: Updated string underflow detection

ethan7g · Jan 21, 2019 · 372b692 · 372b692
1 parent 9419c6b
commit 372b692
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/types/string.js b/lib/types/string.js
@@ -2,13 +2,25 @@ module.exports = {
 	'parse': (buf, from, data) => {
 		const stringLengthLength = 4
 
+		if (buf.length - from < stringLengthLength) {
+			return {
+				'hadUnderflow': true
+			}
+		}
+
 		const stringLength = buf.readUIntLE(from, stringLengthLength)
 		const stringStart = from + stringLengthLength
 
+		if (buf.length - from < stringLength + stringLengthLength) {
+			return {
+				'hadUnderflow': true
+			}
+		}
+
 		return {
 			'readBytes': stringLengthLength + stringLength,
 			'data': buf.toString(data.encoding, stringStart, stringStart + stringLength),
-			'hadUnderflow': buf.length - from < stringLength + stringLengthLength
+			'hadUnderflow': false
 		}
 	},
 	'serialize': (value, data) => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protocore",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Specify and deploy custom binary protocol structures in Node",
   "main": "index.js",
   "scripts": {