Merge branch 'develop' into 'master'

Develop See merge request company-projects/Meadow!50
MeadowSuite · Oct 9, 2018 · 2c90cae · 2c90cae
2 parents 085c5a7 + 48fdb1d
commit 2c90cae
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 3 deletions.
diff --git a/src/Meadow.CoverageReport/Debugging/ExecutionTraceAnalysis.cs b/src/Meadow.CoverageReport/Debugging/ExecutionTraceAnalysis.cs
@@ -844,6 +844,12 @@ private void ParseScopeTracepoint(int traceIndex, SourceMapEntry currentEntry, E
                             // Create a local variable
                             LocalVariable localVariable = new LocalVariable(parameter, true, stackIndex, currentEntry);
 
+                            // If the name is blank, override it
+                            if (string.IsNullOrEmpty(localVariable.Name))
+                            {
+                                localVariable.Name = $"<ReturnVariable{parameterIndex + 1}>";
+                            }
+
                             // Add our local variable to our scope
                             currentScope.AddLocalVariable(localVariable);
                         }

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/BaseVariable.cs b/src/Meadow.CoverageReport/Debugging/Variables/BaseVariable.cs
@@ -23,7 +23,7 @@ public abstract class BaseVariable
         /// <summary>
         /// The name of this variable.
         /// </summary>
-        public string Name { get; private set; }
+        public string Name { get; set; }
         /// <summary>
         /// The AST node which describes the type for this variable.
         /// </summary>

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarAddress.cs b/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarAddress.cs
@@ -20,8 +20,8 @@ public VarAddress(AstElementaryTypeName type) : base(type)
         #region Functions
         public override object ParseData(Memory<byte> data)
         {
-            // If there is no data, return a zero address.
-            if (data.Length == 0)
+            // If there is insufficient data, return a zero address.
+            if (data.Length < Address.SIZE)
             {
                 return new Address(new byte[Address.SIZE]);
             }

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarArray.cs b/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarArray.cs
@@ -60,6 +60,12 @@ public VarArray(AstArrayTypeName type, VarLocation location) : base(type)
         #region Functions
         public override object ParseDereferencedFromMemory(Memory<byte> memory, int offset)
         {
+            // Verify our bounds
+            if (offset >= memory.Length)
+            {
+                return Array.Empty<object>();
+            }
+
             // Define our length.
             int length = 0;
 

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarDynamicBytes.cs b/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarDynamicBytes.cs
@@ -25,6 +25,12 @@ public VarDynamicBytes(AstElementaryTypeName type, VarLocation location) : base(
         #region Functions
         public override object ParseDereferencedFromMemory(Memory<byte> memory, int offset)
         {
+            // Verify our bounds
+            if (offset >= memory.Length)
+            {
+                return default(Memory<byte>);
+            }
+
             // Dynamic memory is a WORD denoting length, followed by the length in bytes of data.
 
             // Read a length bytes (size of word) to dereference the value.

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarFixedBytes.cs b/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarFixedBytes.cs
@@ -21,6 +21,12 @@ public VarFixedBytes(AstElementaryTypeName type) : base(type)
         #region Functions
         public override object ParseData(Memory<byte> data)
         {
+            // If our data is not the correct size, return an empty array
+            if (data.Length < SizeBytes)
+            {
+                return default(Memory<byte>);
+            }
+
             // Slice our data off.
             return data.Slice(0, SizeBytes);
         }

diff --git a/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarStruct.cs b/src/Meadow.CoverageReport/Debugging/Variables/UnderlyingTypes/VarStruct.cs
@@ -50,6 +50,12 @@ public VarStruct(AstUserDefinedTypeName type, VarLocation location) : base(type)
         #region Functions
         public override object ParseDereferencedFromMemory(Memory<byte> memory, int offset)
         {
+            // Verify our bounds
+            if (offset >= memory.Length)
+            {
+                return Array.Empty<VariableValuePair>();
+            }
+
             // Create our result array
             var results = new VariableValuePair[Members.Length];