Skip to content

MarkdownTextBlock: Add guard against NRE in MyCodeBlock and HtmlBlockRenderer #742

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
merged 2 commits into from
Oct 2, 2025
Merged

MarkdownTextBlock: Add guard against NRE in MyCodeBlock and HtmlBlockRenderer #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28c3767
Add guard against NRE in MyCodeBlock and HtmlBlockRenderer
jiripolasek Oct 2, 2025
9472330
Merge branch 'main' into feature/MarkdownTextBlock-fix-nre-codeblock
niels9001 Oct 2, 2025
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
13 changes: 8 additions & 5 deletions components/MarkdownTextBlock/src/Renderers/ObjectRenderers/HtmlBlockRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ protected override void Write(WinUIRenderer renderer, HtmlBlock obj)
if (obj == null) throw new ArgumentNullException(nameof(obj));

var stringBuilder = new StringBuilder();
foreach (var line in obj.Lines.Lines)
if (obj.Lines.Lines != null)
{
var lineText = line.Slice.ToString().Trim();
if (String.IsNullOrWhiteSpace(lineText))
foreach (var line in obj.Lines.Lines)
{
continue;
var lineText = line.Slice.ToString().Trim();
if (String.IsNullOrWhiteSpace(lineText))
{
continue;
}
stringBuilder.AppendLine(lineText);
}
stringBuilder.AppendLine(lineText);
}

var html = Regex.Replace(stringBuilder.ToString(), @"\t|\n|\r", "", RegexOptions.Compiled);
Expand Down
23 changes: 13 additions & 10 deletions components/MarkdownTextBlock/src/TextElements/MyCodeBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,23 @@ public MyCodeBlock(CodeBlock codeBlock, MarkdownConfig config)
{
#endif

foreach (var line in codeBlock.Lines.Lines)
if (codeBlock.Lines.Lines != null)
{
var paragraph = new Paragraph();
var lineString = line.ToString();
if (!String.IsNullOrWhiteSpace(lineString))
foreach (var line in codeBlock.Lines.Lines)
{
paragraph.Inlines.Add(new Run() { Text = lineString });
var paragraph = new Paragraph();
var lineString = line.ToString();
if (!String.IsNullOrWhiteSpace(lineString))
{
paragraph.Inlines.Add(new Run() { Text = lineString });
}
richTextBlock.Blocks.Add(paragraph);
}
richTextBlock.Blocks.Add(paragraph);

border.Child = richTextBlock;
container.Child = border;
_paragraph.Inlines.Add(container);
}

border.Child = richTextBlock;
container.Child = border;
_paragraph.Inlines.Add(container);
}

public void AddChild(IAddChild child) {}
Expand Down
Loading