From 23fa3029b89a150250a97b7939c8e28443e153ed Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 27 Aug 2020 10:41:47 +0200 Subject: [PATCH] libvaladoc/gtkdoc-importer: Don't let parse_block_taglet() return null This caused criticals like: valadoc_taglets_param_set_is_c_self_param: assertion 'self != NULL' failed --- libvaladoc/documentation/gtkdoccommentparser.vala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libvaladoc/documentation/gtkdoccommentparser.vala b/libvaladoc/documentation/gtkdoccommentparser.vala index c1b1d0ea8..a67ca3b20 100644 --- a/libvaladoc/documentation/gtkdoccommentparser.vala +++ b/libvaladoc/documentation/gtkdoccommentparser.vala @@ -235,15 +235,16 @@ public class Valadoc.Gtkdoc.Parser : Object, ResourceLocator { var ic = parse_inline_content (); parse_docbook_spaces (false); - if (current.type != TokenType.EOF) { - this.report_unexpected_token (current, ""); - return null; - } - BlockContent? taglet = factory.create_taglet (taglet_name) as BlockContent; assert (taglet != null); Paragraph paragraph = factory.create_paragraph (); - paragraph.content.add (ic); + + if (current.type == TokenType.EOF) { + paragraph.content.add (ic); + } else { + this.report_unexpected_token (current, ""); + } + taglet.content.add (paragraph); return taglet as Taglet; } -- 2.47.2