fix: NPE when calling setNull on a PreparedStatement with no paramete…

…rs (#1620)
pgjdbc · Nov 26, 2019 · 6899a43 · 6899a43
1 parent ff4a66d
commit 6899a43
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java
@@ -183,6 +183,13 @@ public void closeImpl() throws SQLException {
   public void setNull(int parameterIndex, int sqlType) throws SQLException {
     checkClosed();
 
+    if (parameterIndex < 1 || parameterIndex > preparedParameters.getInParameterCount()) {
+      throw new PSQLException(
+        GT.tr("The column index is out of range: {0}, number of columns: {1}.",
+          parameterIndex, preparedParameters.getInParameterCount()),
+        PSQLState.INVALID_PARAMETER_VALUE);
+    }
+
     int oid;
     switch (sqlType) {
       case Types.SQLXML:

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
@@ -1516,4 +1516,16 @@ public void close() throws SecurityException {
       log.setLevel(prevLevel);
     }
   }
+
+  @Test
+  public void testNoParametersNPE() throws SQLException {
+    try {
+      PreparedStatement ps = con.prepareStatement("select 1");
+      ps.setString(1, "null");
+    } catch ( NullPointerException ex ) {
+      fail("Should throw a SQLException");
+    } catch (SQLException ex) {
+      // ignore
+    }
+  }
 }