Safe modifications in SetRawValue

Author: nerzhulart

Mono.Debugging/Mono.Debugging.Evaluation/ArrayElementGroup.cs

@@ -329,8 +329,7 @@ public void SetRawValue (ObjectPath path, object value, EvaluationOptions option
 			int[] idx = StringToIndices (path [1]);
 
 			EvaluationContext cctx = ctx.WithOptions (options);
-			object val = cctx.Adapter.FromRawValue (cctx, value);
-			array.SetElement (idx, val);
+			ValueModificationUtil.ModifyValueFromRaw (cctx, value, val => array.SetElement (idx, val));
 		}
 	}
 

Mono.Debugging/Mono.Debugging.Evaluation/ValueModificationUtil.cs

@@ -36,15 +36,25 @@ internal static EvaluationResult ModifyValue (EvaluationContext context, string
 				throw new ValueModificationException(string.Format ("Cannot get real object of {0}", value), e);
 			}
 			var convertedValue = ConvertRightHandValue (context, val, expectedType);
-			try {
-				valueSetter (convertedValue);
-			} catch (Exception e) {
-				throw new ValueModificationException(string.Format ("Error while assigning new value to object: {0}", e.Message), e);
-			}
+			ModifyValue (convertedValue, valueSetter);
 			// don't wrap with try-catch it, this call normally should not throw exceptions produced by wrong user input.
 			// If exception was occured this means something has gone wrong in we have to report it in log
 			return context.Evaluator.TargetObjectToExpression (context, convertedValue);
 		}
 
+		internal static void ModifyValueFromRaw (EvaluationContext context, object rawValue, Action<object> valueSetter)
+		{
+			object val = context.Adapter.FromRawValue (context, rawValue);
+			ModifyValue (val, valueSetter);
+		}
+
+		static void ModifyValue (object value, Action<object> valueSetter)
+		{
+			try {
+				valueSetter (value);
+			} catch (Exception e) {
+				throw new ValueModificationException (string.Format ("Error while assigning new value to object: {0}", e.Message), e);
+			}
+		}
 	}
 }

Mono.Debugging/Mono.Debugging.Evaluation/ValueReference.cs

@@ -169,7 +169,7 @@ protected virtual void SetRawValue (ObjectPath path, object value, EvaluationOpt
 		{
 			var ctx = GetContext (options);
 
-			SetValue (ctx, Context.Adapter.FromRawValue (ctx, value));
+			ValueModificationUtil.ModifyValueFromRaw (ctx, value, val => SetValue (ctx, val));
 		}
 
 		ObjectValue[] IObjectValueSource.GetChildren (ObjectPath path, int index, int count, EvaluationOptions options)