agentroam-runtime-darwin-arm64 0.2.0-preview.59 → 0.2.0-preview.63

package/runtime/node_modules/mediabunny/src/isobmff/isobmff-misc.ts

@@ -49,6 +49,10 @@ export type PsshBox = {
 };
 
 export const parsePsshBoxContents = (contents: Uint8Array): PsshBox => {
+	if (contents.length < 24) {
+		throw new Error('Invalid pssh box: too small.');
+	}
+
 	const view = toDataView(contents);
 	let pos = 0;
 
@@ -65,6 +69,10 @@ export const parsePsshBoxContents = (contents: Uint8Array): PsshBox => {
 		const kidCount = view.getUint32(pos);
 		pos += 4;
 
+		if (pos + 16 * kidCount + 4 > contents.length) {
+			throw new Error('Invalid pssh box: key ID count exceeds box size.');
+		}
+
 		if (kidCount > 0) {
 			keyIds = [];
 			for (let i = 0; i < kidCount; i++) {

package/runtime/node_modules/mediabunny/src/isobmff/isobmff-reader.ts

@@ -128,7 +128,7 @@ export const readDataBox = (slice: FileSlice) => {
 		return null;
 	}
 
-	if (slice.remainingLength < 8) {
+	if (header.contentSize < 8 || slice.remainingLength < 8) {
 		// Box is too small
 		return null;
 	}

package/runtime/node_modules/mediabunny/src/matroska/ebml.ts

@@ -539,7 +539,8 @@ export const readVarInt = (slice: FileSlice) => {
 };
 
 export const readUnsignedInt = (slice: FileSlice, width: number) => {
-	if (width < 1 || width > 8) {
+	// Zero width is valid and means zero
+	if (width > 8) {
 		throw new Error('Bad unsigned int size ' + width);
 	}
 
@@ -555,7 +556,7 @@ export const readUnsignedInt = (slice: FileSlice, width: number) => {
 };
 
 export const readUnsignedBigInt = (slice: FileSlice, width: number) => {
-	if (width < 1) {
+	if (width < 1 || width > 8) {
 		throw new Error('Bad unsigned int size ' + width);
 	}
 
@@ -646,12 +647,12 @@ export const readAsciiString = (slice: FileSlice, length: number) => {
 	const bytes = readBytes(slice, length);
 
 	// Actual string length might be shorter due to null terminators
-	let strLength = 0;
-	while (strLength < length && bytes[strLength] !== 0) {
-		strLength += 1;
+	let str = '';
+	for (let i = 0; i < length && bytes[i] !== 0; i++) {
+		str += String.fromCharCode(bytes[i]!);
 	}
 
-	return String.fromCharCode(...bytes.subarray(0, strLength));
+	return str;
 };
 
 export const readUnicodeString = (slice: FileSlice, length: number) => {
@@ -719,10 +720,13 @@ export const resync = async (reader: Reader, startPos: number, ids: EBMLId[], un
 	while (currentPos < until) {
 		let slice = reader.requestSliceRange(currentPos, 0, Math.min(CHUNK_SIZE, until - currentPos));
 		if (isThenable(slice)) slice = await slice;
-		if (!slice) break;
-		if (slice.length < MAX_VAR_INT_SIZE) break;
+		if (!slice || slice.length === 0) break;
+
+		// The last few positions are left for the next chunk so their IDs can be read in full. Close to the end, there
+		// is no next chunk to speak of, so we must still make progress.
+		const positionsToCheck = Math.max(slice.length - MAX_VAR_INT_SIZE, 1);
 
-		for (let i = 0; i < slice.length - MAX_VAR_INT_SIZE; i++) {
+		for (let i = 0; i < positionsToCheck; i++) {
 			slice.filePos = currentPos;
 
 			const elementId = readElementId(slice);