From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 20 Mar 2021 15:19:35 +0000 (+0100)
Subject: libvaladoc/girimporter: Don't guess length of xml header, iterate forward to <repository>
X-Git-Tag: 0.52.1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bda851954033cd570882517a464f78aff23a2f2;p=thirdparty%2Fvala.git

libvaladoc/girimporter: Don't guess length of xml header, iterate forward to <repository>

If e.g. the xml header is missing, it resulted in errors like:

    error: expected start element of `repository'
    error: unsupported GIR version (null) (supported: 1.2)
---

diff --git a/libvaladoc/importer/girdocumentationimporter.vala b/libvaladoc/importer/girdocumentationimporter.vala
index b7d475043..e0ae01d6c 100644
--- a/libvaladoc/importer/girdocumentationimporter.vala
+++ b/libvaladoc/importer/girdocumentationimporter.vala
@@ -69,10 +69,14 @@ public class Valadoc.Importer.GirDocumentationImporter : DocumentationImporter {
 		this.reader = new Vala.MarkupReader (source_file);
 
 		// xml prolog
-		next ();
-		next ();
+		do {
+			next ();
+			if (current_token == Vala.MarkupTokenType.EOF) {
+				error ("unexpected end of file");
+				return;
+			}
+		} while (current_token != Vala.MarkupTokenType.START_ELEMENT && reader.name != "repository");
 
-		next ();
 		parse_repository ();
 
 		reader = null;