Skip to content

fix: prevent infinite loops in collection deserialization by skipping unexpected tokens #5

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
glucaci merged 1 commit into from
Jan 5, 2026
Merged

fix: prevent infinite loops in collection deserialization by skipping unexpected tokens #5

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/Yamlify.SourceGenerator/YamlSourceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,8 @@ private static void GenerateReadMethod(StringBuilder sb, TypeToGenerate type, IR

sb.AppendLine(" if (reader.TokenType != YamlTokenType.MappingStart)");
sb.AppendLine(" {");
sb.AppendLine(" // Skip unexpected token to prevent infinite loops when reading collections");
sb.AppendLine(" reader.Skip();");
sb.AppendLine(" return default;");
sb.AppendLine(" }");
sb.AppendLine();
Expand Down Expand Up @@ -2819,6 +2821,8 @@ private static void GenerateRootCollectionRead(StringBuilder sb, ITypeSymbol col

sb.AppendLine(" if (reader.TokenType != YamlTokenType.SequenceStart)");
sb.AppendLine(" {");
sb.AppendLine(" // Skip unexpected token to prevent infinite loops when reading collections");
sb.AppendLine(" reader.Skip();");
sb.AppendLine(" return default;");
sb.AppendLine(" }");
sb.AppendLine();
Expand Down Expand Up @@ -2860,6 +2864,8 @@ private static void GenerateRootDictionaryRead(StringBuilder sb, ITypeSymbol dic

sb.AppendLine(" if (reader.TokenType != YamlTokenType.MappingStart)");
sb.AppendLine(" {");
sb.AppendLine(" // Skip unexpected token to prevent infinite loops when reading collections");
sb.AppendLine(" reader.Skip();");
sb.AppendLine(" return default;");
sb.AppendLine(" }");
sb.AppendLine();
Expand Down
7 changes: 7 additions & 0 deletions src/Yamlify/Reader/Utf8YamlReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,13 @@ public void Skip()
// Keep reading until we exit the current depth
}
}
else if (_tokenType is YamlTokenType.Scalar)
{
// For scalar values (including nulls like ~, null, Null, NULL), just advance to the next token
Read();
}
// For other tokens (end markers, etc.), do nothing - they're structural tokens
// that don't need to be skipped
}
}

Expand Down
Loading