Skip to content

Commit 5174843

Browse files
committed
added exception check on UTF8 parsing to prevent escaping exceptions.
1 parent 24797f6 commit 5174843

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,17 @@ private boolean parseHeaders()
268268
}
269269
if (c == '\r' || (last != '\r' && c == '\n'))
270270
{
271-
String line = Strings.fromUTF8ByteArray(buf.toByteArray());
271+
String line;
272+
273+
try
274+
{
275+
line = Strings.fromUTF8ByteArray(buf.toByteArray());
276+
}
277+
catch (Exception e)
278+
{
279+
throw new ArmoredInputException(e.getMessage());
280+
}
281+
272282
if (line.trim().length() == 0)
273283
{
274284
break;

0 commit comments

Comments
 (0)