From 420327073fe40bbc473ef2c49e3da43f4ef2ca55 Mon Sep 17 00:00:00 2001
From: Dennis Wagelaar
Date: Fri, 19 Aug 2016 15:05:14 +0200
Subject: 499982: Evaluating VMException.toString() may throw new VMException

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=499982---
 .../src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse')

diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
index 841ed601..867af7cf 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
@@ -315,14 +315,22 @@ public final class StackFrame {
 					if (lv.getSlot() == slot && lv.getStartInstructionIndex() <= loc && lv.getEndInstructionIndex() >= loc) {
 						sb.append(lv.toString());
 						sb.append(" = ");
-						sb.append(EMFTVMUtil.toPrettyString(locals[slot], getEnv()));
+						try {
+							sb.append(EMFTVMUtil.toPrettyString(locals[slot], getEnv()));
+						} catch (VMException e) {
+							sb.append("<VMException>");
+						}
 						break;
 					}
 				}
 			}
 			sb.append(']');
 		} else {
-			sb.append(EMFTVMUtil.toPrettyString(locals, getEnv()));
+			try {
+				sb.append(EMFTVMUtil.toPrettyString(locals, getEnv()));
+			} catch (VMException e) {
+				sb.append("<VMException>");
+			}
 		}
 		final StackFrame parent = getParent();
 		if (parent != null) {
-- 
cgit v1.2.3