icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stack overflow in scripts shouldn't crash the game, fixes #934

Browse Source
This commit is contained in:
gnembon committed 2021-06-25 23:31:46 -03:00
1 parent bf6fddd645
commit 8fa54c8146
3 files changed
+28 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetScriptHost.java
+16 -6
View File
@@ -136,6 +136,10 @@ public class CarpetScriptHost extends ScriptHost
host.handleErrorWithStack("Math doesn't compute", ae);
return null;
}
catch (StackOverflowError soe)
{
host.handleErrorWithStack("Your thoughts are too deep", soe);
}
finally
{
host.storeSource = null;
@@ -698,13 +702,16 @@ public class CarpetScriptHost extends ScriptHost
catch (CarpetExpressionException exc)
{
handleErrorWithStack("Error while running custom command", exc);
return Value.NULL;
}
catch (ArithmeticException ae)
{
handleErrorWithStack("Math doesn't compute", ae);
return Value.NULL;
}
catch (StackOverflowError soe)
{
handleErrorWithStack("Your thoughts are too deep", soe);
}
return Value.NULL;
}
public Value handleCommand(ServerCommandSource source, FunctionValue function, List<Value> args)
@@ -716,13 +723,16 @@ public class CarpetScriptHost extends ScriptHost
catch (CarpetExpressionException exc)
{
handleErrorWithStack("Error while running custom command", exc);
return Value.NULL;
}
catch (ArithmeticException ae)
{
handleErrorWithStack("Math doesn't compute", ae);
return Value.NULL;
}
catch (StackOverflowError soe)
{
handleErrorWithStack("Your thoughts are too deep", soe);
}
return Value.NULL;
}
public Value callLegacy(ServerCommandSource source, String call, List<Integer> coords, String arg)
@@ -1068,13 +1078,13 @@ public class CarpetScriptHost extends ScriptHost
super.resetErrorSnooper();
}
public void handleErrorWithStack(String intro, Exception exception)
public void handleErrorWithStack(String intro, Throwable exception)
{
if (responsibleSource != null)
{
if (exception instanceof CarpetExpressionException) ((CarpetExpressionException) exception).printStack(responsibleSource);
String message = exception.getMessage();
Messenger.m(responsibleSource, "r "+intro+(message.isEmpty()?"":": "+message));
Messenger.m(responsibleSource, "r "+intro+( (message == null || message.isEmpty())?"":": "+message));
}
else
{