Fix possible crash in SQLiteDatabase.changePassword functions

Christopher J. Brody · Christopher J. Brody · commit da1cc4e366f5 · 2016-07-25T09:34:54.000+02:00
diff --git a/src/net/sqlcipher/database/SQLiteDatabase.java b/src/net/sqlcipher/database/SQLiteDatabase.java
@@ -100,7 +100,9 @@ public void changePassword(String password) throws SQLiteException {
         if (!isOpen()) {
             throw new SQLiteException("database not open");
         }
-        native_rekey(password);
+        if (password != null) {
+            native_rekey(password);
+        }
     }
 
     /**
@@ -119,7 +121,9 @@ public void changePassword(char[] password) throws SQLiteException {
         if (!isOpen()) {
             throw new SQLiteException("database not open");
         }
-        native_rekey(password == null ? null : String.valueOf(password));
+        if (password != null) {
+            native_rekey(String.valueOf(password));
+        }
     }
   
     private static void loadICUData(Context context, File workingDir) {
@@ -2829,7 +2833,7 @@ private static ArrayList<Pair<String, String>> getAttachedDbs(SQLiteDatabase dbO
 
     private native int native_status(int operation, boolean reset);
 
-  private native void native_key(char[] key) throws SQLException;
+    private native void native_key(char[] key) throws SQLException;
   
     private native void native_rekey(String key) throws SQLException;
 }

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,9 @@ public void changePassword(String password) throws SQLiteException {`
`100`	`100`	`if (!isOpen()) {`
`101`	`101`	`throw new SQLiteException("database not open");`
`102`	`102`	`}`
`103`		`- native_rekey(password);`
	`103`	`+ if (password != null) {`
	`104`	`+ native_rekey(password);`
	`105`	`+ }`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`/**`
`@@ -119,7 +121,9 @@ public void changePassword(char[] password) throws SQLiteException {`
`119`	`121`	`if (!isOpen()) {`
`120`	`122`	`throw new SQLiteException("database not open");`
`121`	`123`	`}`
`122`		`- native_rekey(password == null ? null : String.valueOf(password));`
	`124`	`+ if (password != null) {`
	`125`	`+ native_rekey(String.valueOf(password));`
	`126`	`+ }`
`123`	`127`	`}`
`124`	`128`
`125`	`129`	`private static void loadICUData(Context context, File workingDir) {`
`@@ -2829,7 +2833,7 @@ private static ArrayList<Pair<String, String>> getAttachedDbs(SQLiteDatabase dbO`
`2829`	`2833`
`2830`	`2834`	`private native int native_status(int operation, boolean reset);`
`2831`	`2835`
`2832`		`- private native void native_key(char[] key) throws SQLException;`
	`2836`	`+ private native void native_key(char[] key) throws SQLException;`
`2833`	`2837`
`2834`	`2838`	`private native void native_rekey(String key) throws SQLException;`
`2835`	`2839`	`}`