DRAGONAGE: Catch exceptions in NWScript function StringToVector

On error, it should return an empty vector.
xoreos · Nov 13, 2016 · 3fdab19 · 3fdab19
1 parent 7b0a52f
commit 3fdab19
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/engines/dragonage/script/functions_string.cpp b/src/engines/dragonage/script/functions_string.cpp
@@ -206,9 +206,13 @@ void Functions::stringToVector(Aurora::NWScript::FunctionContext &ctx) {
 	if (Common::UString::split(ctx.getParams()[0].getString(), ' ', parts) != 3)
 		return;
 
-	Common::parseString(parts[0], x);
-	Common::parseString(parts[1], y);
-	Common::parseString(parts[2], z);
+	try {
+		Common::parseString(parts[0], x);
+		Common::parseString(parts[1], y);
+		Common::parseString(parts[2], z);
+	} catch (...) {
+		return;
+	}
 
 	ctx.getReturn().setVector(x, y, z);
 }