feat: always check stack size when popping

gudzpoz · Jun 28, 2024 · 9eea382 · 9eea382
1 parent 6817d5c
commit 9eea382
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/example/suite/src/main/java/party/iroiro/luajava/LuaTestSuite.java b/example/suite/src/main/java/party/iroiro/luajava/LuaTestSuite.java
@@ -684,6 +684,10 @@ private void testStackOperations() {
         try (Lua L = constructor.get()) {
             assertEquals(0, L.getTop());
             assertEquals(0, L.newThread().getTop());
+            assertThrowsLua(LuaError.MEMORY, () -> L.pop(-1), "invalid number of items to pop");
+            assertThrowsLua(LuaError.MEMORY, () -> L.pop(10), "invalid number of items to pop");
+            L.setTop(0);
+            assertThrowsLua(LuaError.MEMORY, () -> L.pop(1), "invalid number of items to pop");
         }
 
         Lua sub = L.newThread();

diff --git a/luajava/src/main/java/party/iroiro/luajava/AbstractLua.java b/luajava/src/main/java/party/iroiro/luajava/AbstractLua.java
@@ -547,6 +547,12 @@ public void insert(int index) {
 
     @Override
     public void pop(int n) {
+        if (n < 0 || getTop() < n) {
+            throw new LuaException(
+                    LuaException.LuaError.MEMORY,
+                    "invalid number of items to pop"
+            );
+        }
         C.lua_pop(L, n);
     }