From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 27 Aug 2020 08:41:47 +0000 (+0200)
Subject: libvaladoc/gtkdoc-importer: Don't let parse_block_taglet() return null
X-Git-Tag: 0.40.24~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e62cc23a39b566b6aed55494c43659ad280c12;p=thirdparty%2Fvala.git

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
---

diff --git a/libvaladoc/documentation/gtkdoccommentparser.vala b/libvaladoc/documentation/gtkdoccommentparser.vala
index bf3be801a..cc8133d9f 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, "<EOF>");
-			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, "<EOF>");
+		}
+
 		taglet.content.add (paragraph);
 		return taglet as Taglet;
 	}