cbor-extract 2.2.1 → 2.2.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-extract",
   "author": "Kris Zyp",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Node addon for string extraction for cbor-x",
   "license": "MIT",
   "repository": {
@@ -18,7 +18,7 @@
     "prebuild-libc": "prebuildify-platform-packages --tag-libc --target 24.14.0 && ENABLE_V8_FUNCTIONS=false prebuildify-platform-packages --platform-packages --napi --tag-libc --target 20.20.0",
     "prebuild-libc-alpine": "ENABLE_V8_FUNCTIONS=false prebuildify-cross --image alpine --tag-libc --napi --target 20.20.0",
     "publish-all": "cd prebuilds/darwin-x64 && npm publish --access public && cd ../darwin-arm64 && npm publish --access public && cd ../linux-x64 && npm publish --access public && cd ../linux-arm64 && npm publish --access public  && cd ../linux-arm && npm publish --access public && cd ../.. && npm publish --access public",
-    "test": "node ./index.js"
+    "test": "node ./index.js && node test/scan.cjs && node test/strings.cjs"
   },
   "main": "./index.js",
   "gypfile": true,
@@ -40,11 +40,11 @@
     "prebuildify-cross": "5.0.0"
   },
   "optionalDependencies": {
-    "@cbor-extract/cbor-extract-darwin-arm64": "2.2.1",
-    "@cbor-extract/cbor-extract-darwin-x64": "2.2.1",
-    "@cbor-extract/cbor-extract-linux-arm": "2.2.1",
-    "@cbor-extract/cbor-extract-linux-arm64": "2.2.1",
-    "@cbor-extract/cbor-extract-linux-x64": "2.2.1",
-    "@cbor-extract/cbor-extract-win32-x64": "2.2.1"
+    "@cbor-extract/cbor-extract-darwin-arm64": "2.2.3",
+    "@cbor-extract/cbor-extract-darwin-x64": "2.2.3",
+    "@cbor-extract/cbor-extract-linux-arm": "2.2.3",
+    "@cbor-extract/cbor-extract-linux-arm64": "2.2.3",
+    "@cbor-extract/cbor-extract-linux-x64": "2.2.3",
+    "@cbor-extract/cbor-extract-win32-x64": "2.2.3"
   }
 }

package/src/extract.cpp

@@ -39,7 +39,24 @@ public:
 	uint32_t stringStart = 0;
 	uint32_t lastStringEnd = 0;
 
-	void readString(napi_env env, uint32_t length, bool allowStringBlocks) {
+	// false with a RangeError pending when V8 rejects the string (longer than its maximum length)
+	bool createString(napi_env env, uint32_t start, uint32_t length, bool latin1, napi_value* value) {
+		napi_status status = latin1 ?
+			napi_create_string_latin1(env, (const char*) source + start, length, value) :
+			napi_create_string_utf8(env, (const char*) source + start, length, value);
+		if (status != napi_ok) {
+			napi_throw_range_error(env, NULL, "Unable to create a string from the buffer");
+			return false;
+		}
+		return true;
+	}
+	bool appendString(napi_env env, uint32_t start, uint32_t length, bool latin1) {
+		if (!createString(env, start, length, latin1, &target[writePosition]))
+			return false;
+		writePosition++;
+		return true;
+	}
+	bool readString(napi_env env, uint32_t length, bool allowStringBlocks) {
 		uint32_t start = position;
 		uint32_t end = position + length;
 		if (allowStringBlocks) { // for larger strings, we don't bother to check every character for being latin, and just go right to creating a new string
@@ -54,40 +71,39 @@ public:
 		if (position < end) {
 			// non-latin character
 			if (lastStringEnd) {
-				napi_value value;
-				napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
-				target[writePosition++] = value;
+				if (!appendString(env, stringStart, lastStringEnd - stringStart, true))
+					return false;
 				lastStringEnd = 0;
 			}
 			// use standard utf-8 conversion
-			napi_value value;
-			napi_create_string_utf8(env, (const char*) source + start, (int) length, &value);
-			target[writePosition++] = value;
+			if (!appendString(env, start, length, false))
+				return false;
 			position = end;
-			return;
+			return true;
 		}
 
 		if (lastStringEnd) {
 			if (start - lastStringEnd > 40 || end - stringStart > 6000) {
-				napi_value value;
-				napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
-				target[writePosition++] = value;
+				if (!appendString(env, stringStart, lastStringEnd - stringStart, true))
+					return false;
 				stringStart = start;
 			}
 		} else {
 			stringStart = start;
 		}
 		lastStringEnd = end;
+		return true;
 	}
 	napi_value extractStrings(napi_env env, uint32_t startingPosition, uint32_t size, uint32_t firstStringSize, uint8_t* inputSource) {
 		writePosition = 0;
 		lastStringEnd = 0;
 		position = startingPosition;
 		source = inputSource;
-		if (startingPosition + firstStringSize > size) {
+		if ((uint64_t)startingPosition + firstStringSize > size) {
 			return unexpectedEnd(env);
 		}
-		readString(env, firstStringSize, firstStringSize < 0x100);
+		if (!readString(env, firstStringSize, firstStringSize < 0x100))
+			return NULL;
 		while (position < size) {
 			uint8_t token = source[position++];
 			uint8_t majorType = token >> 5;
@@ -96,23 +112,23 @@ public:
 				uint32_t length;
 				switch (token) {
 					case 0x18:
-						if (position + 1 > size) {
+						if (size - position < 1) {
 							return unexpectedEnd(env);
 						}
 						length = source[position++];
 						break;
 					case 0x19:
-						if (position + 2 > size) {
+						if (size - position < 2) {
 							return unexpectedEnd(env);
 						}
 						length = source[position++] << 8;
 						length += source[position++];
 						break;
 					case 0x1a:
-						if (position + 4 > size) {
+						if (size - position < 4) {
 							return unexpectedEnd(env);
 						}
-						length = source[position++] << 24;
+						length = (uint32_t) source[position++] << 24;
 						length += source[position++] << 16;
 						length += source[position++] << 8;
 						length += source[position++];
@@ -124,13 +140,16 @@ public:
 				}
 				if (majorType == 3) {
 					// string
-					if (length + position > size) {
+					if (length > size - position) {
 						return unexpectedEnd(env);
 					}
-					readString(env, length, length < 0x100);
-					if (writePosition >= MAX_TARGET_SIZE)
+					if (!readString(env, length, length < 0x100))
+						return NULL;
+					if (writePosition >= MAX_TARGET_SIZE - 1) // reserve slot for double-write
 						break;
 				} else { // binary data
+					if (length >= size - position) // a declared length that reaches the end ends the scan, and can't wrap position
+						break;
 					position += length;
 				}
 
@@ -153,7 +172,8 @@ public:
 		}
 		if (lastStringEnd) {
 			napi_value value;
-			napi_create_string_latin1(env, (const char*) source + stringStart, lastStringEnd - stringStart, &value);
+			if (!createString(env, stringStart, lastStringEnd - stringStart, true, &value))
+				return NULL;
 			if (writePosition == 0) {
 				return value;
 			}
@@ -194,6 +214,12 @@ napi_value extractStrings(napi_env env, napi_callback_info info) {
 		napi_throw_type_error(env, NULL, "Unexpected buffer type, expected a Buffer");
 		return args[0];
 	}
+	if (size > buffer_size || position > buffer_size) {
+		return unexpectedEnd(env);
+	}
+	// fixed-size skips advance by at most 8 past a position below size, so this keeps them from wrapping
+	if (size > UINT32_MAX - 8)
+		size = UINT32_MAX - 8;
 	return extractor->extractStrings(env, position, size, firstStringSize, source);
 }
 #define EXPORT_NAPI_FUNCTION(name, func) { napi_property_descriptor desc = { name, 0, func, 0, 0, 0, (napi_property_attributes) (napi_writable | napi_configurable), 0 }; napi_define_properties(env, exports, 1, &desc); }