Skip to content

Report malformed JSON keyset fields as IOException instead of an uncaught exception #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adilburaksen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Report malformed JSON keyset fields as IOException instead of an uncaught exception #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/google/crypto/tink/JsonKeysetReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public Keyset read() throws IOException {
try {
return keysetFromJson(
JsonParser.parse(new String(Util.readAll(inputStream), UTF_8)).getAsJsonObject());
} catch (JsonParseException | IllegalStateException e) {
} catch (JsonParseException | IllegalStateException | UnsupportedOperationException e) {
throw new IOException(e);
} finally {
if (inputStream != null) {
Expand All @@ -177,7 +177,7 @@ public EncryptedKeyset readEncrypted() throws IOException {
try {
return encryptedKeysetFromJson(
JsonParser.parse(new String(Util.readAll(inputStream), UTF_8)).getAsJsonObject());
} catch (JsonParseException | IllegalStateException e) {
} catch (JsonParseException | IllegalStateException | UnsupportedOperationException e) {
throw new IOException(e);
} finally {
if (inputStream != null) {
Expand Down