Skip to content

Fix CBOR deserializer crash on empty input for no-input operations #1103

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

Merged
sugmanue merged 5 commits into from
Mar 31, 2026
Merged

Fix CBOR deserializer crash on empty input for no-input operations #1103

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
937475a
Fix CBOR deserializer crash on empty input for operations with no inp…
praguna14 Mar 28, 2026
606e734
Update codecs/cbor-codec/src/main/java/software/amazon/smithy/java/cb…
sugmanue Mar 31, 2026
078f425
Merge branch 'main' into main
sugmanue Mar 31, 2026
9c7ec78
Update codecs/cbor-codec/src/main/java/software/amazon/smithy/java/cb…
sugmanue Mar 31, 2026
42af9ca
Merge branch 'main' into main
sugmanue Mar 31, 2026
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
5 changes: 5 additions & 0 deletions codecs/cbor-codec/src/main/java/software/amazon/smithy/java/cbor/CborDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.concurrent.ConcurrentHashMap;
import software.amazon.smithy.java.cbor.CborParser.Token;
import software.amazon.smithy.java.core.schema.Schema;
import software.amazon.smithy.java.core.schema.TraitKey;
import software.amazon.smithy.java.core.serde.SerializationException;
import software.amazon.smithy.java.core.serde.ShapeDeserializer;
import software.amazon.smithy.java.core.serde.document.Document;
Expand Down Expand Up @@ -357,6 +358,10 @@ public Instant readTimestamp(Schema schema) {
@Override
public <T> void readStruct(Schema schema, T state, StructMemberConsumer<T> consumer) {
byte token = parser.currentToken();
if (schema.hasTrait(TraitKey.UNIT_TYPE_TRAIT) && token == Token.FINISHED) {
Copy link
Copy Markdown
Contributor

@adwsingh adwsingh Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should reverse the order, the second condition is much cheaper and if its false it would be a faster short-circuit

Copy link
Copy Markdown
Contributor

@sugmanue sugmanue Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I will post a follow up for this.

// Empty input — treat as empty struct with no members.
return;
}
if (token != Token.START_OBJECT) {
throw badType("struct", token);
}
Expand Down