[vala/staging] girparser: Don't guess length of xml header, iterate forward to <repository>
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] girparser: Don't guess length of xml header, iterate forward to <repository>
- Date: Fri, 19 Mar 2021 15:11:58 +0000 (UTC)
commit 68ef9751c57b408e2199ed3fb739f8c5ad0ee60c
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Fri Mar 19 16:00:49 2021 +0100
girparser: 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)
vala/valagirparser.vala | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index b1086b893..2345c355e 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1479,10 +1479,14 @@ public class Vala.GirParser : CodeVisitor {
reader = new MarkupReader (source_file.filename);
// xml prolog
- next ();
- next ();
+ do {
+ next ();
+ if (current_token == MarkupTokenType.EOF) {
+ Report.error (get_current_src (), "unexpected end of file");
+ return;
+ }
+ } while (current_token != MarkupTokenType.START_ELEMENT && reader.name != "repository");
- next ();
parse_repository ();
reader = null;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]