Prevent NullPointerException when calling delete with null parameter for where args

developernotes · developernotes · commit ce1d19ffae1f · 2024-09-04T15:37:24.000-05:00
diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherDatabaseTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherDatabaseTest.java
@@ -504,4 +504,21 @@ public void shouldAllowCursorWindowToResize(){
       SQLiteCursor.resetCursorWindowSize();
     }
   }
+
+  @Test
+  public void shouldSupportDeleteWithNullWhereArgs(){
+    long rowsFound = -1L;
+    database.execSQL("create table t1(a,b);");
+    Object[] whereArgs = null;
+    database.execSQL("insert into t1(a,b) values(?,?)", new Object[]{1, 2});
+    database.execSQL("insert into t1(a,b) values(?,?)", new Object[]{3, 4});
+    long rowsDeleted = database.delete("t1", "a in (1, 3)", whereArgs);
+    assertThat(rowsDeleted, is(2L));
+    Cursor cursor = database.rawQuery("select count(*) from t1;", null);
+    if(cursor != null && cursor.moveToNext()){
+      rowsFound = cursor.getLong(0);
+      cursor.close();
+    }
+    assertThat(rowsFound, is(0L));
+  }
 }
diff --git a/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteDatabase.java b/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteDatabase.java
@@ -1180,17 +1180,19 @@ public long insert(String table, int conflictAlgorithm, ContentValues values) th
 
     @Override
     public int delete(String table, String whereClause, Object[] whereArgs) {
-        String[] args = new String[whereArgs.length];
-        for(int index = 0; index < whereArgs.length; index++) {
+        int length = whereArgs == null ? 0 : whereArgs.length;
+        String[] args = new String[length];
+        for(int index = 0; index < length; index++) {
             args[index] = whereArgs[index].toString();
         }
         return delete(table, whereClause, args);
     }
 
     @Override
     public int update(String table, int conflictAlgorithm, ContentValues values, String whereClause, Object[] whereArgs) {
-        String[] args = new String[whereArgs.length];
-        for(int index = 0; index < whereArgs.length; index++) {
+        int length = whereArgs == null ? 0 : whereArgs.length;
+        String[] args = new String[length];
+        for(int index = 0; index < length; index++) {
            args[index] = whereArgs[index].toString();
         }
         return updateWithOnConflict(table, values, whereClause, args, conflictAlgorithm);
