From 7462108b714d07161126dcedda5312daef54ae13 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 24 May 2019 08:47:36 -0700 Subject: Add tuple.IsNull(), remove fields when set to default and other small fixes --- src/WixToolset.Data/IntermediateTuple.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Data/IntermediateTuple.cs') diff --git a/src/WixToolset.Data/IntermediateTuple.cs b/src/WixToolset.Data/IntermediateTuple.cs index 09ff7692..bc46e3b4 100644 --- a/src/WixToolset.Data/IntermediateTuple.cs +++ b/src/WixToolset.Data/IntermediateTuple.cs @@ -46,9 +46,9 @@ namespace WixToolset.Data creator.TryGetTupleDefinitionByName(definitionName, out var definition); // TODO: this isn't sufficient. var tuple = definition.CreateTuple(sourceLineNumbers, id); - for (var i = 0; i < fieldsJson.Count; ++i) + for (var i = 0; i < fieldsJson.Count && i < tuple.Fields.Length; ++i) { - if (tuple.Fields.Length > i && fieldsJson[i] is JsonObject fieldJson) + if (fieldsJson[i] is JsonObject fieldJson) { tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], baseUri, fieldJson); } -- cgit v1.2.3-55-g6feb