[Scummvm-git-logs] scummvm master -> fc075e29da31e8016884cd4e4c8468a578507463

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
93791189fa GUI: Relaxed property requirement in <font> key.
fc075e29da GUI: Added sanity check to <font> key parser


Commit: 93791189fad6474478048c72d7d0f03a087a8392
    https://github.com/scummvm/scummvm/commit/93791189fad6474478048c72d7d0f03a087a8392
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-17T02:27:15+02:00

Commit Message:
GUI: Relaxed property requirement in <font> key.

<language> now inherits values from <font>, thus, any could be missing

Changed paths:
    gui/ThemeParser.h


diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 88893c1992..f91bd26f45 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -63,14 +63,14 @@ protected:
 			XML_KEY(fonts)
 				XML_KEY(font)
 					XML_PROP(id, true)
-					XML_PROP(file, true)
+					XML_PROP(file, false)
 					XML_PROP(resolution, false)
 					XML_PROP(scalable_file, false)
 					XML_PROP(point_size, false)
 					XML_KEY(language)
 						XML_PROP(id, true)
 						XML_PROP(file, false)
-						XML_PROP(scalable_file, true)
+						XML_PROP(scalable_file, false)
 						XML_PROP(point_size, false)
 					KEY_END()
 				KEY_END()


Commit: fc075e29da31e8016884cd4e4c8468a578507463
    https://github.com/scummvm/scummvm/commit/fc075e29da31e8016884cd4e4c8468a578507463
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-17T02:30:20+02:00

Commit Message:
GUI: Added sanity check to <font> key parser

Changed paths:
    gui/ThemeParser.cpp


diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 75f2f52a27..020e1091c4 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -211,6 +211,10 @@ bool ThemeParser::parserCallback_language(ParserNode *node) {
 		file = getParentNode(node)->values["file"];
 	}
 
+	if (file.empty()) {
+		return parserError("Missing required property 'file' in either <font> or <language>");
+	}
+
 	Common::String scalableFile;
 	if (node->values.contains("scalable_file")) {
 		scalableFile = node->values["scalable_file"];