fix: increase robustness in connection / invocation decoder

nrkno · Jul 31, 2020 · ef28575 · ef28575
1 parent 88534e2
commit ef28575
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/encodings/ber/decoder/Invocation.ts b/src/encodings/ber/decoder/Invocation.ts
@@ -33,9 +33,13 @@ function decodeInvocation(
 				reader.readSequence(Ber.BERDataTypes.SEQUENCE)
 				seqOffset = reader.offset + reader.length
 				while (reader.offset < seqOffset) {
-					reader.readSequence(Ber.CONTEXT(0))
-					// const dataTag = dataSeq.peek() // TODO I think readValue gets the tag
-					args.push(reader.readValue())
+					const tag = reader.readSequence()
+					if (tag === Ber.CONTEXT(0)) {
+						args.push(reader.readValue())
+					} else {
+						unknownContext(errors, 'decode invocation arguments', tag, options)
+						skipNext(reader)
+					}
 				}
 				break
 			case 0:

diff --git a/src/encodings/ber/decoder/Matrix.ts b/src/encodings/ber/decoder/Matrix.ts
@@ -253,9 +253,14 @@ function decodeConnections(
 	reader.readSequence(Ber.BERDataTypes.SEQUENCE)
 	const endOffset = reader.offset + reader.length
 	while (reader.offset < endOffset) {
-		reader.readSequence(Ber.CONTEXT(0))
-		const connection = appendErrors(decodeConnection(reader, options), connections)
-		connections.value[connection.target] = connection
+		const tag = reader.readSequence()
+		if (tag === Ber.CONTEXT(0)) {
+			const connection = appendErrors(decodeConnection(reader, options), connections)
+			connections.value[connection.target] = connection
+		} else {
+			// unknownContext(errors, 'decode invocation arguments', tag, options)
+			skipNext(reader)
+		}
 	}
 	return connections
 }