From 9fd2c67b4db95b3b825dec5a6932ebe3160b8b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= <seonwoo960000@toss.im>
Date: Wed, 29 Jan 2025 12:04:07 +0900
Subject: [PATCH] Add tests for out of bound access to arrays

---
 .../tursodatabase/core/LimboResultSet.java    |  2 +-
 .../tursodatabase/jdbc4/JDBC4Statement.java   |  3 +-
 .../jdbc4/JDBC4ResultSetTest.java             | 70 +++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
index 6fe1ef1a3..1884d4786 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/core/LimboResultSet.java
@@ -129,7 +129,7 @@ public class LimboResultSet {
     }
 
     final Object[] resultSet = this.lastStepResult.getResult();
-    if (columnIndex > resultSet.length) {
+    if (columnIndex > resultSet.length || columnIndex < 0) {
       throw new SQLException("columnIndex out of bound");
     }
 
diff --git a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
index af3652d7e..3965e3cae 100644
--- a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
+++ b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Statement.java
@@ -57,7 +57,8 @@ public class JDBC4Statement implements Statement {
   @Override
   public ResultSet executeQuery(String sql) throws SQLException {
     ensureOpen();
-    statement = this.withConnectionTimeout(
+    statement =
+        this.withConnectionTimeout(
             () -> {
               try {
                 // TODO: if sql is a readOnly query, do we still need the locks?
diff --git a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
index 285ab1506..ec79ce1eb 100644
--- a/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
+++ b/bindings/java/src/test/java/org/github/tursodatabase/jdbc4/JDBC4ResultSetTest.java
@@ -443,4 +443,74 @@ class JDBC4ResultSetTest {
     assertTrue(resultSet.next());
     assertNull(resultSet.getBytes(1));
   }
+
+  @Test
+  void test_getXXX_methods_on_multiple_columns() throws Exception {
+    stmt.executeUpdate(
+        "CREATE TABLE test_integration ("
+            + "string_col TEXT, "
+            + "boolean_col INTEGER, "
+            + "byte_col INTEGER, "
+            + "short_col INTEGER, "
+            + "int_col INTEGER, "
+            + "long_col BIGINT, "
+            + "float_col REAL, "
+            + "double_col REAL, "
+            + "bigdecimal_col REAL, "
+            + "bytes_col BLOB);");
+
+    stmt.executeUpdate(
+        "INSERT INTO test_integration VALUES ("
+            + "'test', "
+            + "1, "
+            + "1, "
+            + "123, "
+            + "12345, "
+            + "1234567890, "
+            + "1.23, "
+            + "1.234567, "
+            + "12345.67, "
+            + "X'48656C6C6F');");
+
+    ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_integration");
+    assertTrue(resultSet.next());
+
+    // Verify each column
+    assertEquals("test", resultSet.getString(1));
+    assertTrue(resultSet.getBoolean(2));
+    assertEquals(1, resultSet.getByte(3));
+    assertEquals(123, resultSet.getShort(4));
+    assertEquals(12345, resultSet.getInt(5));
+    assertEquals(1234567890L, resultSet.getLong(6));
+    assertEquals(1.23f, resultSet.getFloat(7), 0.0001);
+    assertEquals(1.234567, resultSet.getDouble(8), 0.0001);
+    assertEquals(
+        new BigDecimal("12345.67").setScale(2, RoundingMode.HALF_UP),
+        resultSet.getBigDecimal(9, 2));
+    assertArrayEquals("Hello".getBytes(), resultSet.getBytes(10));
+  }
+
+  @Test
+  void test_invalidColumnIndex_outOfBounds() throws Exception {
+    stmt.executeUpdate("CREATE TABLE test_invalid (col INTEGER);");
+    stmt.executeUpdate("INSERT INTO test_invalid (col) VALUES (1);");
+
+    ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_invalid");
+    assertTrue(resultSet.next());
+
+    // Test out-of-bounds column index
+    assertThrows(SQLException.class, () -> resultSet.getInt(2));
+  }
+
+  @Test
+  void test_invalidColumnIndex_negative() throws Exception {
+    stmt.executeUpdate("CREATE TABLE test_invalid (col INTEGER);");
+    stmt.executeUpdate("INSERT INTO test_invalid (col) VALUES (1);");
+
+    ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_invalid");
+    assertTrue(resultSet.next());
+
+    // Test negative column index
+    assertThrows(SQLException.class, () -> resultSet.getInt(-1));
+  }
 }