Add type checks in Proton.find_proton_versions (tkashkin#292, tkashkin#101)

tkashkin · tkashkin · commit 9b022f299b87 · 2019-08-02T17:04:44.000+03:00
diff --git a/src/data/compat/Proton.vala b/src/data/compat/Proton.vala
@@ -267,16 +267,24 @@ namespace GameHub.Data.Compat
 				if(app_node != null && app_node is BinaryVDF.ListNode)
 				{
 					var app = (BinaryVDF.ListNode) app_node;
-					var common = (BinaryVDF.ListNode) app.get_nested({"appinfo", "common"});
+					var common_node = app.get_nested({"appinfo", "common"});
 
-					if(common != null)
+					if(common_node != null && common_node is BinaryVDF.ListNode)
 					{
-						var name = ((BinaryVDF.StringNode) common.get("name")).value;
-						var type = ((BinaryVDF.StringNode) common.get("type")).value;
+						var common = (BinaryVDF.ListNode) common_node;
 
-						if(type.down() == "tool" && name.down().has_prefix("proton "))
+						var name_node = common.get("name");
+						var type_node = common.get("type");
+
+						if(name_node != null && name_node is BinaryVDF.StringNode && type_node != null && type_node is BinaryVDF.StringNode)
 						{
-							versions.add(new Proton(app.key, name));
+							var name = ((BinaryVDF.StringNode) name_node).value;
+							var type = ((BinaryVDF.StringNode) type_node).value;
+
+							if(type != null && type.down() == "tool" && name != null && name.down().has_prefix("proton "))
+							{
+								versions.add(new Proton(app.key, name));
+							}
 						}
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -267,16 +267,24 @@ namespace GameHub.Data.Compat`
`267`	`267`	`if(app_node != null && app_node is BinaryVDF.ListNode)`
`268`	`268`	`{`
`269`	`269`	`var app = (BinaryVDF.ListNode) app_node;`
`270`		`- var common = (BinaryVDF.ListNode) app.get_nested({"appinfo", "common"});`
	`270`	`+ var common_node = app.get_nested({"appinfo", "common"});`
`271`	`271`
`272`		`- if(common != null)`
	`272`	`+ if(common_node != null && common_node is BinaryVDF.ListNode)`
`273`	`273`	`{`
`274`		`- var name = ((BinaryVDF.StringNode) common.get("name")).value;`
`275`		`- var type = ((BinaryVDF.StringNode) common.get("type")).value;`
	`274`	`+ var common = (BinaryVDF.ListNode) common_node;`
`276`	`275`
`277`		`- if(type.down() == "tool" && name.down().has_prefix("proton "))`
	`276`	`+ var name_node = common.get("name");`
	`277`	`+ var type_node = common.get("type");`
	`278`	`+`
	`279`	`+ if(name_node != null && name_node is BinaryVDF.StringNode && type_node != null && type_node is BinaryVDF.StringNode)`
`278`	`280`	`{`
`279`		`- versions.add(new Proton(app.key, name));`
	`281`	`+ var name = ((BinaryVDF.StringNode) name_node).value;`
	`282`	`+ var type = ((BinaryVDF.StringNode) type_node).value;`
	`283`	`+`
	`284`	`+ if(type != null && type.down() == "tool" && name != null && name.down().has_prefix("proton "))`
	`285`	`+ {`
	`286`	`+ versions.add(new Proton(app.key, name));`
	`287`	`+ }`
`280`	`288`	`}`
`281`	`289`	`}`
`282`	`290`	`}`